诊断、手术、药品信息修改接口添加

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

@@ -78,13 +78,18 @@ public class DiseaseManagementFacade {
     }
 
     /**
+     * 通过id修改诊断
+     *
      * @param upDiseaseByIdVO
-     * @Description修改诊断
-     * @Return java.lang.Boolean
+     * @return 是否修改成功
      */
     public Boolean upDiseaseById(UpDiseaseByIdVO upDiseaseByIdVO) {
-
-        return false;
+        if (diseaseInfoFacade.getById(upDiseaseByIdVO.getId()) == null) {
+            Asserts.fail("该诊断不存在！");
+        }
+        DiseaseInfo diseaseInfo = new DiseaseInfo();
+        BeanUtil.copyProperties(upDiseaseByIdVO, diseaseInfo);
+        return diseaseInfoFacade.updateById(diseaseInfo);
     }
 
     /**
@@ -101,7 +106,7 @@ public class DiseaseManagementFacade {
     }
 
     /**
-     *匹配诊断
+     * 匹配诊断
      *
      * @param matchingDiseaseVO
      * @Return java.lang.Boolean
@@ -114,14 +119,14 @@ public class DiseaseManagementFacade {
     }
 
     /**
-     *医院诊断标准词匹配信息导入
+     * 医院诊断标准词匹配信息导入
      *
      * @param file 导入文件
      * @Return java.lang.String
      */
     public String importDisease(MultipartFile file) {
-        List<ImportDiseaseVO> diagnoseExcelVOS =  ExcelUtils.importExcel(file,0,1, ImportDiseaseVO.class);
-        if(ListUtil.isEmpty(diagnoseExcelVOS)){
+        List<ImportDiseaseVO> diagnoseExcelVOS = ExcelUtils.importExcel(file, 0, 1, ImportDiseaseVO.class);
+        if (ListUtil.isEmpty(diagnoseExcelVOS)) {
             Asserts.fail("Excel文件为空");
         }
         //去重

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

@@ -13,6 +13,7 @@ import com.lantone.daqe.vo.AddDrugVO;
 import com.lantone.daqe.vo.DelDrugByIdVO;
 import com.lantone.daqe.vo.GetDrugPageVO;
 import com.lantone.daqe.vo.MatchingDrugVO;
+import com.lantone.daqe.vo.UpDrugByIdVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -74,6 +75,21 @@ public class DrugManagementFacade {
         return drugInfoFacade.save(drugInfo);
     }
 
+    /**
+     * 通过id修改药品
+     *
+     * @param upDrugByIdVO
+     * @return 是否修改成功
+     */
+    public Boolean upDrugById(UpDrugByIdVO upDrugByIdVO) {
+        if (drugInfoFacade.getById(upDrugByIdVO.getId()) == null) {
+            Asserts.fail("该药品不存在！");
+        }
+        DrugInfo drugInfo = new DrugInfo();
+        BeanUtil.copyProperties(upDrugByIdVO, drugInfo);
+        return drugInfoFacade.updateById(drugInfo);
+    }
+
     /**
      * 通过id删除药品
      *
@@ -88,15 +104,13 @@ public class DrugManagementFacade {
     }
 
     /**
-     *
-     *
      * @param matchingDrugVO
      * @Return java.lang.Boolean
      */
     public Boolean matchingDrug(MatchingDrugVO matchingDrugVO) {
 
         DrugInfo drugInfo = new DrugInfo();
-        BeanUtils.copyProperties(matchingDrugVO,drugInfo);
+        BeanUtils.copyProperties(matchingDrugVO, drugInfo);
         return drugInfoFacade.updateById(drugInfo);
     }
 }

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

@@ -13,6 +13,7 @@ import com.lantone.daqe.vo.AddOperationVO;
 import com.lantone.daqe.vo.DelOperationByIdVO;
 import com.lantone.daqe.vo.GetOperationPageVO;
 import com.lantone.daqe.vo.MatchingOperationVO;
+import com.lantone.daqe.vo.UpOperationByIdVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -72,6 +73,21 @@ public class OperationManagementFacade {
         return operationInfoFacade.save(operationInfo);
     }
 
+    /**
+     * 通过id修改手术
+     *
+     * @param upOperationByIdVO
+     * @return 是否修改成功
+     */
+    public Boolean upOperationById(UpOperationByIdVO upOperationByIdVO) {
+        if (operationInfoFacade.getById(upOperationByIdVO.getId()) == null) {
+            Asserts.fail("该药品不存在！");
+        }
+        OperationInfo operationInfo = new OperationInfo();
+        BeanUtil.copyProperties(upOperationByIdVO, operationInfo);
+        return operationInfoFacade.updateById(operationInfo);
+    }
+
     /**
      * 通过id删除手术
      *
@@ -86,14 +102,14 @@ public class OperationManagementFacade {
     }
 
     /**
-     *匹配手术信息
+     * 匹配手术信息
      *
      * @param matchingOperationVO
      * @Return java.lang.Boolean
      */
     public Boolean matchingOperation(MatchingOperationVO matchingOperationVO) {
         OperationInfo operationInfo = new OperationInfo();
-        BeanUtils.copyProperties(matchingOperationVO,operationInfo);
+        BeanUtils.copyProperties(matchingOperationVO, operationInfo);
         return operationInfoFacade.updateById(operationInfo);
     }
 }

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

@@ -2,7 +2,6 @@ package com.lantone.daqe.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,25 +10,35 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
- * @Description:修改诊断-接口入参
+ * @Description: 通过id修改诊断-接口入参
  * @Author songxl
  * @Date 2022/2/28
  */
-@ApiModel(value = "修改诊断-接口入参")
+@ApiModel(value = "通过id修改诊断-接口入参")
 @Getter
 @Setter
 public class UpDiseaseByIdVO implements Serializable {
+
     private static final long serialVersionUID = 5262000808815034181L;
 
     @ApiModelProperty(value = "诊断ID", required = true)
     @NotNull(message = "诊断ID不能为空")
     private Long id;
 
+    @ApiModelProperty(value = "组织机构ID", required = true)
+    @NotNull(message = "组织机构ID不能为空")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院诊断代码", required = true)
+    @NotBlank(message = "医院诊断代码不能为空")
+    private String code;
+
     @ApiModelProperty(value = "医院诊断名称", required = true)
     @NotBlank(message = "医院诊断名称不能为空")
     private String name;
 
-    @ApiModelProperty(value = "ICD-10编码")
+    @ApiModelProperty(value = "ICD-10编码", required = true)
+    @NotBlank(message = "ICD-10编码不能为空")
     private String icd10;
 
 }

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

@@ -0,0 +1,44 @@
+package com.lantone.daqe.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 通过id修改药品-接口入参
+ * @Author songxl
+ * @Date 2022/2/28
+ */
+@ApiModel(value = "通过id修改药品-接口入参")
+@Getter
+@Setter
+public class UpDrugByIdVO implements Serializable {
+
+    private static final long serialVersionUID = 5262000808815034181L;
+
+    @ApiModelProperty(value = "药品ID", required = true)
+    @NotNull(message = "药品ID不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "组织机构ID", required = true)
+    @NotNull(message = "组织机构ID不能为空")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院药品代码", required = true)
+    @NotBlank(message = "医院药品代码不能为空")
+    private String code;
+
+    @ApiModelProperty(value = "医院药品名称", required = true)
+    @NotBlank(message = "医院药品名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "国药准字", required = true)
+    @NotBlank(message = "国药准字不能为空")
+    private String approvalNum;
+
+}

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

@@ -0,0 +1,40 @@
+package com.lantone.daqe.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 通过id修改手术-接口入参
+ * @Author songxl
+ * @Date 2022/2/28
+ */
+@ApiModel(value = "通过id修改手术-接口入参")
+@Getter
+@Setter
+public class UpOperationByIdVO implements Serializable {
+
+    private static final long serialVersionUID = 5262000808815034181L;
+
+    @ApiModelProperty(value = "手术ID", required = true)
+    @NotNull(message = "手术ID不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "组织机构ID", required = true)
+    @NotNull(message = "组织机构ID不能为空")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "手术和操作代码", required = true)
+    @NotBlank(message = "手术和操作代码不能为空")
+    private String code;
+
+    @ApiModelProperty(value = "医院手术/操作名称", required = true)
+    @NotBlank(message = "医院手术/操作名称不能为空")
+    private String name;
+
+}

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

@@ -7,7 +7,6 @@ import com.lantone.daqe.facade.DiseaseManagementFacade;
 import com.lantone.daqe.vo.AddDiseaseVO;
 import com.lantone.daqe.vo.DelDiseaseByIdVO;
 import com.lantone.daqe.vo.GetDiseasePageVO;
-import com.lantone.daqe.vo.ImportDiseaseVO;
 import com.lantone.daqe.vo.MatchingDiseaseVO;
 import com.lantone.daqe.vo.UpDiseaseByIdVO;
 import io.swagger.annotations.Api;
@@ -47,9 +46,9 @@ public class DiseaseManagementController {
         return CommonResult.success(diseaseManagementFacade.addDisease(addDiseaseVO));
     }
 
-    @ApiOperation(value = "修改诊断 [by:songxl]", notes = "修改诊断")
+    @ApiOperation(value = "通过id修改诊断 [by:songxl]", notes = "通过id修改诊断")
     @PostMapping("/upDiseaseById")
-    public CommonResult<Boolean> upDiseaseById(@RequestBody UpDiseaseByIdVO upDiseaseByIdVO) {
+    public CommonResult<Boolean> upDiseaseById(@RequestBody @Valid UpDiseaseByIdVO upDiseaseByIdVO) {
         return CommonResult.success(diseaseManagementFacade.upDiseaseById(upDiseaseByIdVO));
     }
 

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

@@ -8,6 +8,7 @@ import com.lantone.daqe.vo.AddDrugVO;
 import com.lantone.daqe.vo.DelDrugByIdVO;
 import com.lantone.daqe.vo.GetDrugPageVO;
 import com.lantone.daqe.vo.MatchingDrugVO;
+import com.lantone.daqe.vo.UpDrugByIdVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,12 @@ public class DrugManagementController {
         return CommonResult.success(drugManagementFacade.addDrug(addDrugVO));
     }
 
+    @ApiOperation(value = "通过id修改药品 [by:songxl]")
+    @PostMapping("/upDrugById")
+    public CommonResult<Boolean> upDrugById(@RequestBody @Valid UpDrugByIdVO upDrugByIdVO) {
+        return CommonResult.success(drugManagementFacade.upDrugById(upDrugByIdVO));
+    }
+
     @ApiOperation(value = "通过id删除药品 [by:songxl]")
     @PostMapping("/delDrugById")
     public CommonResult<Boolean> delDrugById(@RequestBody @Valid DelDrugByIdVO delDrugByIdVO) {

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

@@ -8,6 +8,7 @@ import com.lantone.daqe.vo.AddOperationVO;
 import com.lantone.daqe.vo.DelOperationByIdVO;
 import com.lantone.daqe.vo.GetOperationPageVO;
 import com.lantone.daqe.vo.MatchingOperationVO;
+import com.lantone.daqe.vo.UpOperationByIdVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,12 @@ public class OperationManagementController {
         return CommonResult.success(operationManagementFacade.addOperation(addOperationVO));
     }
 
+    @ApiOperation(value = "通过id修改手术 [by:songxl]")
+    @PostMapping("/upOperationById")
+    public CommonResult<Boolean> upOperationById(@RequestBody @Valid UpOperationByIdVO upOperationByIdVO) {
+        return CommonResult.success(operationManagementFacade.upOperationById(upOperationByIdVO));
+    }
+
     @ApiOperation(value = "通过id删除手术 [by:songxl]")
     @PostMapping("/delOperationById")
     public CommonResult<Boolean> delOperationById(@RequestBody @Valid DelOperationByIdVO delOperationByIdVO) {