智能预问诊模板维护，新增和修改接口合并为一个

precman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -115,24 +115,33 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
      * @param addModulInfoVO
      * @return
      */
-    public Boolean saveModuleInfo(AddModuleInfoVO addModulInfoVO) {
-        String userId = UserUtils.getCurrentPrincipleID();
-        Date now = DateUtil.now();
-        ModuleInfo moduleInfo = new ModuleInfo();
-        BeanUtil.copyProperties(addModulInfoVO, moduleInfo);
-        moduleInfo.setCreator(userId);
-        moduleInfo.setModifier(userId);
-        moduleInfo.setGmtCreate(now);
-        moduleInfo.setGmtModified(now);
-        moduleInfo.setType(addModulInfoVO.getType());
-        moduleInfo.setModuleType(addModulInfoVO.getModuleType());
-        //当添加为科室专用模板时添加关联id
-        if(addModulInfoVO.getModuleType().intValue() == 1){
-            moduleInfo.setRelationId(addModulInfoVO.getRelationId());
+    public Boolean saveOrUpdateModuleInfo(AddModuleInfoVO addModulInfoVO) {
+        Long moduleId = null;
+        Boolean bac = false;
+        if(addModulInfoVO.getId() == null){
+            String userId = UserUtils.getCurrentPrincipleID();
+            Date now = DateUtil.now();
+            ModuleInfo moduleInfo = new ModuleInfo();
+            BeanUtil.copyProperties(addModulInfoVO, moduleInfo);
+            moduleInfo.setCreator(userId);
+            moduleInfo.setModifier(userId);
+            moduleInfo.setGmtCreate(now);
+            moduleInfo.setGmtModified(now);
+            moduleInfo.setType(addModulInfoVO.getType());
+            moduleInfo.setModuleType(addModulInfoVO.getModuleType());
+            //当添加为科室专用模板时添加关联id
+            if(addModulInfoVO.getModuleType().intValue() == 1){
+                moduleInfo.setRelationId(addModulInfoVO.getRelationId());
+            }
+            this.save(moduleInfo);
+            moduleId = moduleInfo.getId();
+            bac = moduleDetailFacade.saveOrUpdateInfos(addModulInfoVO, moduleId);
+        }else {
+            UpdateModuleInfoVO updateModuleInfoVO = new UpdateModuleInfoVO();
+            BeanUtil.copyProperties(addModulInfoVO,updateModuleInfoVO);
+            bac = this.updateModuleInfo(updateModuleInfoVO);
         }
-        this.save(moduleInfo);
-        Long moduleId = moduleInfo.getId();
-        return moduleDetailFacade.saveOrUpdateInfos(addModulInfoVO, moduleId);
+        return bac;
     }
 
     /**

precman-service/src/main/java/com/diagbot/vo/AddModuleInfoVO.java

@@ -14,6 +14,8 @@ import java.util.List;
 @Getter
 @Setter
 public class AddModuleInfoVO {
+    //模板id，修改时传，新增不用传
+    private Long id;
     @NotNull(message="模板名称不能为空")
     private String name;
     @NotNull(message="模板归属不能为空")

precman-service/src/main/java/com/diagbot/web/ModuleInfoController.java

@@ -15,7 +15,6 @@ import com.diagbot.vo.GetAllDeptAndDisInfoVO;
 import com.diagbot.vo.GetModuleInfoOneVO;
 import com.diagbot.vo.GetModuleInfoVO;
 import com.diagbot.vo.GetModuleTypeVO;
-import com.diagbot.vo.UpdateModuleInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,8 +45,9 @@ public class ModuleInfoController {
     @Autowired
     ModuleInfoFacade moduleInfoFacade;
 
-    @ApiOperation(value = "模板新增[by:wangyu]",
-            notes = "name: 模板名称，必填<br>" +
+    @ApiOperation(value = "模板新增或修改[by:wangyu]",
+            notes = "id，修改时传，新增不用传<br>" +
+                    "name: 模板名称，必填<br>" +
                     "type: 模板类型（症状，诊疗情况，其他），必填<br>" +
                     "questionId: 标签id，不是标点符号时需要填写<br>" +
                     "flag: 特殊标识类型<br>" +
@@ -57,29 +57,11 @@ public class ModuleInfoController {
                     "moduleType: 模板类型（科室，通用），必填<br>" +
                     "relationId: 关联id，moduleType为0不用传，moduleType为1传科室id，moduleType为2传疾病id<br>" +
                     "remark：备注")
-    @PostMapping("/saveModuleInfo")
-    @SysLogger("saveModuleInfo")
-    @Transactional
-    public RespDTO<Boolean> saveModuleInfo(@Valid @RequestBody AddModuleInfoVO addModuleInfoVO) {
-        Boolean data = moduleInfoFacade.saveModuleInfo(addModuleInfoVO);
-        return RespDTO.onSuc(data);
-    }
-
-    @ApiOperation(value = "模板修改[by:wangyu]",
-            notes = "id: 模板id，必填<br>" +
-                    "name: 模板名称，必填<br>" +
-                    "type: 模板类型（症状，诊疗情况，其他），必填<br>" +
-                    "questionId: 标签id，必填<br>" +
-                    "flag: 特殊标示类型<br>" +
-                    "relationModule: 关联模板id<br>"+
-                    "moduleType: 模板类型（科室，通用），必填<br>" +
-                    "relationId: 关联id，moduleType为0不用传，moduleType为1传科室id<br>" +
-                    "remark: 备注")
-    @PostMapping("/updateModuleInfo")
-    @SysLogger("updateModuleInfo")
+    @PostMapping("/saveOrUpdateModuleInfo")
+    @SysLogger("saveOrUpdateModuleInfo")
     @Transactional
-    public RespDTO<Boolean> updateModuleInfo(@Valid @RequestBody UpdateModuleInfoVO updateModuleInfoVO) {
-        Boolean data = moduleInfoFacade.updateModuleInfo(updateModuleInfoVO);
+    public RespDTO<Boolean> saveOrUpdateModuleInfo(@Valid @RequestBody AddModuleInfoVO addModuleInfoVO) {
+        Boolean data = moduleInfoFacade.saveOrUpdateModuleInfo(addModuleInfoVO);
         return RespDTO.onSuc(data);
     }