Merge remote-tracking branch 'origin/dev/20220228_v3.0.1通用版_渠道管理第一期' into dev/20220228_v3.0.1通用版_渠道管理第一期

daqe-center/src/main/java/com/lantone/daqe/dto/GetDiseasePageDTO.java

@@ -19,9 +19,15 @@ public class GetDiseasePageDTO implements Serializable {
 
     private static final long serialVersionUID = -1129177776572833627L;
 
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
     @ApiModelProperty(value = "组织机构ID")
     private Long hospitalId;
-    
+
+    @ApiModelProperty(value = "医院诊断代码")
+    private String code;
+
     @ApiModelProperty(value = "医院诊断名称")
     private String name;
 

daqe-center/src/main/java/com/lantone/daqe/dto/GetDrugPageDTO.java

@@ -19,9 +19,15 @@ public class GetDrugPageDTO implements Serializable {
 
     private static final long serialVersionUID = -3423432863909470619L;
 
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
     @ApiModelProperty(value = "组织机构ID")
     private Long hospitalId;
 
+    @ApiModelProperty(value = "医院药品代码")
+    private String code;
+
     @ApiModelProperty(value = "医院药品名称")
     private String name;
 

daqe-center/src/main/java/com/lantone/daqe/dto/GetOperationPageDTO.java

@@ -18,7 +18,10 @@ import java.io.Serializable;
 public class GetOperationPageDTO implements Serializable {
 
     private static final long serialVersionUID = -4850779079703241414L;
-    
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
     @ApiModelProperty(value = "组织机构ID")
     private Long hospitalId;
 

daqe-center/src/main/java/com/lantone/daqe/facade/DiseaseManagementFacade.java

@@ -33,6 +33,7 @@ public class DiseaseManagementFacade {
 
         QueryWrapper<DiseaseInfo> diseaseInfoQueryWrapper = new QueryWrapper<>();
         diseaseInfoQueryWrapper.eq(getDiseasePageVO.getHospitalId() != null, "hospital_id", getDiseasePageVO.getHospitalId());
+        diseaseInfoQueryWrapper.like(StringUtil.isNotBlank(getDiseasePageVO.getCode()), "code", getDiseasePageVO.getCode());
         diseaseInfoQueryWrapper.like(StringUtil.isNotBlank(getDiseasePageVO.getName()), "name", getDiseasePageVO.getName());
         diseaseInfoQueryWrapper.like(StringUtil.isNotBlank(getDiseasePageVO.getStandard()), "standard", getDiseasePageVO.getStandard());
         diseaseInfoQueryWrapper.like(StringUtil.isNotBlank(getDiseasePageVO.getIcd10()), "icd10", getDiseasePageVO.getIcd10());
@@ -56,9 +57,8 @@ public class DiseaseManagementFacade {
     }
 
     /**
-     *@Description新增诊断
-     *
      * @param addDiseaseVo
+     * @Description新增诊断
      * @Return java.lang.Boolean
      */
     public Boolean addDisease(AddDiseaseVo addDiseaseVo) {
@@ -67,9 +67,8 @@ public class DiseaseManagementFacade {
     }
 
     /**
-     *@Description修改诊断
-     *
      * @param upDiseaseByIdVo
+     * @Description修改诊断
      * @Return java.lang.Boolean
      */
     public Boolean upDiseaseById(UpDiseaseByIdVo upDiseaseByIdVo) {
@@ -78,13 +77,13 @@ public class DiseaseManagementFacade {
     }
 
     /**
-     *@Description删除诊断
-     *
      * @param delDiseaseByIdVo
+     * @Description删除诊断
      * @Return java.lang.Boolean
      */
     public Boolean delDiseaseById(DelDiseaseByIdVo delDiseaseByIdVo) {
 
         return false;
     }
+
 }

daqe-center/src/main/java/com/lantone/daqe/facade/DrugManagementFacade.java

@@ -30,6 +30,7 @@ public class DrugManagementFacade {
 
         QueryWrapper<DrugInfo> drugInfoQueryWrapper = new QueryWrapper<>();
         drugInfoQueryWrapper.eq(getDrugPageVO.getHospitalId() != null, "hospital_id", getDrugPageVO.getHospitalId());
+        drugInfoQueryWrapper.like(StringUtil.isNotBlank(getDrugPageVO.getCode()), "code", getDrugPageVO.getCode());
         drugInfoQueryWrapper.like(StringUtil.isNotBlank(getDrugPageVO.getName()), "name", getDrugPageVO.getName());
         drugInfoQueryWrapper.like(StringUtil.isNotBlank(getDrugPageVO.getApprovalNum()), "approval_num", getDrugPageVO.getApprovalNum());
         drugInfoQueryWrapper.like(StringUtil.isNotBlank(getDrugPageVO.getStandard()), "standard", getDrugPageVO.getStandard());

daqe-center/src/main/java/com/lantone/daqe/facade/OperationManagementFacade.java

@@ -30,6 +30,7 @@ public class OperationManagementFacade {
 
         QueryWrapper<OperationInfo> operationInfoQueryWrapper = new QueryWrapper<>();
         operationInfoQueryWrapper.eq(getOperationPageVO.getHospitalId() != null, "hospital_id", getOperationPageVO.getHospitalId());
+        operationInfoQueryWrapper.like(StringUtil.isNotBlank(getOperationPageVO.getCode()), "code", getOperationPageVO.getCode());
         operationInfoQueryWrapper.like(StringUtil.isNotBlank(getOperationPageVO.getName()), "name", getOperationPageVO.getName());
         operationInfoQueryWrapper.like(StringUtil.isNotBlank(getOperationPageVO.getStandard()), "standard", getOperationPageVO.getStandard());
         if (StringUtil.isNotBlank(getOperationPageVO.getIsMapping())) {

daqe-center/src/main/java/com/lantone/daqe/vo/GetDiseasePageVO.java

@@ -21,6 +21,9 @@ public class GetDiseasePageVO extends Page {
     @ApiModelProperty(value = "组织机构ID")
     private Long hospitalId;
 
+    @ApiModelProperty(value = "医院诊断代码")
+    private String code;
+
     @ApiModelProperty(value = "医院诊断名称")
     private String name;
 

daqe-center/src/main/java/com/lantone/daqe/vo/GetDrugPageVO.java

@@ -21,6 +21,9 @@ public class GetDrugPageVO extends Page {
     @ApiModelProperty(value = "组织机构ID")
     private Long hospitalId;
 
+    @ApiModelProperty(value = "医院药品代码")
+    private String code;
+
     @ApiModelProperty(value = "医院药品名称")
     private String name;
 

daqe-center/src/main/java/com/lantone/daqe/web/DiseaseManagementController.java

@@ -35,7 +35,6 @@ public class DiseaseManagementController {
         return CommonResult.success(diseaseManagementFacade.getDiseasePage(getDiseasePageVO));
     }
 
-
     @ApiOperation(value = "新增诊断 [by:songxl]")
     @PostMapping("/addDisease")
     public CommonResult<Boolean> addDisease(@RequestBody AddDiseaseVo addDiseaseVo) {