长泰视图对接

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -198,7 +198,7 @@ public class CtqyyClient extends CommonHttpClient {
      */
     @Override
     public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) {
-        if(udiwmsProductRequest.getMedicalType().equals(Constants.MEDICAL_TYPE_DEVICE)){
+        if(udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DEVICE)){
             CtqyyRequest ctqyyRequest = new CtqyyRequest();
             ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialDict"));
             ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsProductRequest));
@@ -229,7 +229,7 @@ public class CtqyyClient extends CommonHttpClient {
                 log.error("异常信息：{}", e);
                 return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")");
             }
-        }else if(udiwmsProductRequest.getMedicalType().equals(Constants.MEDICAL_TYPE_DRUG)){
+        }else if(udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DRUG)){
             Map map = new HashMap();
             LambdaQueryWrapper<PhysicDictEntity> wrapper = new LambdaQueryWrapper();
             //补充其他查询条件
@@ -253,8 +253,8 @@ public class CtqyyClient extends CommonHttpClient {
             map.put("list",thrProductsEntityList);
             return ResultVOUtils.success(map);
         }
-        log.error("解析长泰区医院医疗类型，返回结果：{}", udiwmsProductRequest.getMedicalType());
+        log.error("解析长泰区医院医疗类型，返回结果：{}", udiwmsProductRequest.getProductType());
-        return ResultVOUtils.error(500,"医疗类型不正确，medicalType："+udiwmsProductRequest.getMedicalType());
+        return ResultVOUtils.error(500,"医疗类型不正确，medicalType："+udiwmsProductRequest.getProductType());
     }
 
     @Override

src/main/java/com/glxp/mipsdl/constant/Constants.java

@@ -177,14 +177,14 @@ public interface Constants {
      */
     int THIRD_ORDER_RECEIVE = 2;
 
-    //医疗类型
+    //产品类型
     /**
      * 器械
      */
-    int MEDICAL_TYPE_DEVICE = 1;
+    int PRODUCT_TYPE_DEVICE = 1;
     /**
      * 药品
      */
-    int MEDICAL_TYPE_DRUG = 2;
+    int PRODUCT_TYPE_DRUG = 2;
 
 }

src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java

@@ -65,19 +65,19 @@ public class UdiwmsProductRequest extends ListPageRequest {
     private String remark3;
 
     /**
-     * 医疗类型 器械 1  药品 2
+     * 产品类型 器械 1  药品 2
      */
-    private Integer medicalType;
+    private Integer productType;
 
     /**
      * 为空默认 器械 1
      * @return
      */
-    public Integer getMedicalType() {
+    public Integer getProductType() {
-        if(medicalType == null){
+        if(productType == null){
-            return Constants.MEDICAL_TYPE_DEVICE;
+            return Constants.PRODUCT_TYPE_DEVICE;
         }
-        return medicalType;
+        return productType;
     }
 
 }

src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java

@@ -4,7 +4,7 @@ import java.util.Date;
 import lombok.Data;
 
 @Data
-public class UdiwmsThrOrderRequest {
+public class UdiwmsThrOrderRequest extends ListPageRequest{
     /**
      *
      */