Merge remote-tracking branch 'origin/dev/icssNCD' into dev/icssNCD

aipt-service/src/main/java/com/diagbot/facade/ClinicalFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.client.bean.ResponseData;
 import com.diagbot.dto.LisResult;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.SearchVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -54,6 +55,9 @@ public class ClinicalFacade {
     }
 
     private List<LisResult> processLis(List<LisResult> lisArr) {
+        if(ListUtil.isEmpty(lisArr)){
+            return lisArr;
+        }
 
         String Otherval = "";
 

docs/006.20190304慢病基于icss增量脚本/init_icss_NCD.sql

@@ -260,4 +260,4 @@ INSERT INTO `icss_index_config` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-0
 --模板信息字段修改
 alter table icss_module_info change  column disease module_type bigint(20) COMMENT '(0.通用 1.根据科室划分 2.慢病)';
 alter table icss_module_info add  column relation_id bigint(20) NOT NULL DEFAULT '0' COMMENT '关联id';
-ALTER TABLE `icss_module_info` MODIFY COLUMN `type`  int(11) NOT NULL DEFAULT 0 COMMENT '类型(1.主诉 2.现病史 3.其他史 4.查体 5.化验 6.辅检 7.诊断 8.医嘱 22.现病史空模板 30.通用子模板 31.主诉子模板 32.现病史子模板)' AFTER `name`;
+ALTER TABLE `icss_module_info` MODIFY COLUMN `type`  varchar(20) NOT NULL DEFAULT 0 COMMENT '类型(1.主诉 2.现病史 3.其他史 4.查体 5.化验 6.辅检 7.诊断 8.医嘱 22.现病史空模板 31.主诉子模板 32.现病史子模板 322.现病史空模板子模板)' AFTER `name`;

icss-service/src/main/java/com/diagbot/client/bean/MedicalIndication.java

@@ -1,20 +1,19 @@
 package com.diagbot.client.bean;
 
-import com.alibaba.fastjson.JSONObject;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 
 /**
- * @Description:
+ * @Description:推送指标
  * @Author:zhaops
  * @time: 2019/3/14 14:40
  */
 @Getter
 @Setter
 public class MedicalIndication {
-    private Integer type; //1-量表，2-核心指标，3-公式，4，是否
     private String name;
-    private JSONObject content;  //type<>1 量表之外的内容
-    private String scaleName;    //type=1 量表名字
+    private List<MedicalIndicationDetail> details;
 }

icss-service/src/main/java/com/diagbot/client/bean/MedicalIndicationDetail.java

@@ -0,0 +1,17 @@
+package com.diagbot.client.bean;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:推送指标明细
+ * @Author:zhaops
+ * @time: 2019/4/11 10:15
+ */
+@Getter
+@Setter
+public class MedicalIndicationDetail {
+    private Integer type; //1-量表，2-公式，3-其他指标
+    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""}
+}

icss-service/src/main/java/com/diagbot/dto/MedicalIndicationDTO.java

@@ -4,6 +4,8 @@ import com.diagbot.client.bean.MedicalIndication;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @Description: 指标推送结果
  * @Author:zhaops
@@ -11,8 +13,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class MedicalIndicationDTO extends MedicalIndication {
+public class MedicalIndicationDTO extends MedicalIndication{
     private Long id;
     private String tagName;
-    private ScaleDTO scale;
 }

icss-service/src/main/java/com/diagbot/dto/ModuleInfoDTO.java

@@ -26,7 +26,7 @@ public class ModuleInfoDTO implements Serializable {
     private Long id; //主键
     private String name;//名称
     private List<ModuleDetailDTO> moduleDetailDTOList = new ArrayList<>(); //模板明细表
-    private Integer type;//模板类型
+    private String type;//模板类型
     private String remark;
 
 }

icss-service/src/main/java/com/diagbot/dto/ScaleDTO.java

@@ -1,17 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description: 量表
- * @Author:zhaops
- * @time: 2019/3/14 14:45
- */
-@Getter
-@Setter
-public class ScaleDTO {
-    private Long id;
-    private String name;
-    private String tagName;
-}

icss-service/src/main/java/com/diagbot/entity/ModuleInfo.java

@@ -63,7 +63,7 @@ public class ModuleInfo implements Serializable {
     /**
      * 类型
      */
-    private Integer type;
+    private String type;
 
     /**
      * 慢病

icssman-service/src/main/java/com/diagbot/dto/GetModuleTypeDTO.java

@@ -12,7 +12,7 @@ import lombok.Setter;
 @Setter
 public class GetModuleTypeDTO {
     //类型
-    private Integer type;
+    private String type;
     //类型名称
     private String name;
 

icssman-service/src/main/java/com/diagbot/entity/ModuleInfo.java

@@ -63,7 +63,7 @@ public class ModuleInfo implements Serializable {
     /**
      * 类型
      */
-    private Integer type;
+    private String type;
 
     /**
      * 慢病

icssman-service/src/main/java/com/diagbot/enums/ModuleInfoTypeEnum.java

@@ -11,8 +11,7 @@ import lombok.Setter;
 public enum ModuleInfoTypeEnum implements KeyedNamed {
     Common(0, "通用"),
     ByDept(1, "根据科室划分"),
-    ByDis(2, "慢病"),
-    Nesting(3, "子模板");
+    ByDis(2, "慢病");
     @Setter
     private Integer key;
 

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

@@ -184,13 +184,20 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
     public List<ModuleInfoDTO> getModuleInfo(GetModuleInfoVO getModuleInfoVO) {
         //获取模板信息
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
-        moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("relation_id", "0");
         if (getModuleInfoVO.getModuleType() != null) {
             moduleInfoQueryWrapper.eq("module_type", getModuleInfoVO.getModuleType());
         }
+        if(getModuleInfoVO.getType() != null) {
+            moduleInfoQueryWrapper.eq("type", getModuleInfoVO.getType());
+        }
         if(ListUtil.isNotEmpty(getModuleInfoVO.getNoIds())){
             moduleInfoQueryWrapper.notIn("id", getModuleInfoVO.getNoIds());
         }
+        if(getModuleInfoVO.getRelationId() != null) {
+            moduleInfoQueryWrapper.eq("relation_id", getModuleInfoVO.getRelationId());
+        }
         List<ModuleInfo> moduleInfoList = this.list(moduleInfoQueryWrapper);
         List<Long> moduleIdList = moduleInfoList.stream().map(m -> m.getId()).collect(Collectors.toList());
         //获取模板明细信息
@@ -275,7 +282,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
             for (ModuleInfoListDTO moduleInfoListDTO : moduleInfoDTOIPage.getRecords()) {
                 moduleInfoListDTO.setUserName(respDTO.data.get(moduleInfoListDTO.getModifier()));
                 if(moduleInfoListDTO.getModuleType().intValue() != 3){
-                    moduleInfoListDTO.setAscriptionName(dictionaryInfoMap.get(String.valueOf(moduleInfoListDTO.getType().intValue())).getName());
+                    moduleInfoListDTO.setAscriptionName(dictionaryInfoMap.get(moduleInfoListDTO.getType()).getName());
                 }
                 if(moduleInfoListDTO.getModuleType().intValue() == 1){
                     moduleInfoListDTO.setRelationName(deptInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
@@ -393,10 +400,12 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
     public List<GetModuleTypeDTO> getModuleType(GetModuleTypeVO getModuleTypeVO){
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
         moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("module_Type", getModuleTypeVO.getModuleType())
-                .eq("relation_id", getModuleTypeVO.getRelationId());
+                .eq("module_Type", getModuleTypeVO.getModuleType());
+        if(getModuleTypeVO.getRelationId() != null){
+            moduleInfoQueryWrapper.eq("relation_id", getModuleTypeVO.getRelationId());
+        }
         List<ModuleInfo> moduleInfos = this.list(moduleInfoQueryWrapper);
-        List<Integer> types = moduleInfos.stream().map(moduleInfo -> moduleInfo.getType()).collect(Collectors.toList());
+        List<String> types = moduleInfos.stream().map(moduleInfo -> moduleInfo.getType()).collect(Collectors.toList());
         //获取模板类型
         QueryWrapper<DictionaryInfo> dictionaryInfoQueryWrapper = new QueryWrapper<>();
         dictionaryInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -409,7 +418,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         for (DictionaryInfo dictionaryInfo: dictionaryInfoList) {
             GetModuleTypeDTO getModuleTypeDTO = new GetModuleTypeDTO();
             getModuleTypeDTO.setName(dictionaryInfo.getName());
-            getModuleTypeDTO.setType(Integer.parseInt(dictionaryInfo.getVal()));
+            getModuleTypeDTO.setType(dictionaryInfo.getVal());
             getModuleTypeDTOS.add(getModuleTypeDTO);
         }
         return getModuleTypeDTOS;

icssman-service/src/main/java/com/diagbot/facade/ScaleContentFacade.java

@@ -18,6 +18,7 @@ import com.diagbot.service.impl.ScaleContentServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DeleteScaleVO;
 import com.diagbot.vo.QuestionPageVO;
 import com.diagbot.vo.ScaleContentSaveVO;
 import com.diagbot.vo.ScaleContentVO;
@@ -112,4 +113,25 @@ public class ScaleContentFacade extends ScaleContentServiceImpl {
     public List<ScaleContentDTO> getByParamFac(Long scaleId) {
         return this.getByParam(scaleId);
     }
+
+
+    /**
+     * 量表列表
+     *
+     * @param deleteScaleVO
+     * @return
+     */
+    public void delete(DeleteScaleVO deleteScaleVO) {
+        Date now = DateUtil.now();
+        String person = UserUtils.getCurrentPrincipleID();
+        List<Long> ids = deleteScaleVO.getIds();
+        for(Long id : ids) {
+            this.update(new ScaleContent(), new UpdateWrapper<ScaleContent>()
+                    .eq("scale_id", id)
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .set("gmt_modified", now)
+                    .set("modifier", person)
+                    .set("is_deleted", IsDeleteEnum.Y.getKey()));
+        }
+    }
 }

icssman-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -3,7 +3,6 @@ package com.diagbot.service.impl;
 import com.diagbot.enums.DisclaimerCodeEnum;
 import com.diagbot.enums.IntroducePositionEnum;
 import com.diagbot.enums.ModuleInfoTypeEnum;
-import com.diagbot.enums.ModuleTypeEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.enums.QuestionUsualTypeEnum;
 import com.diagbot.service.EnumsDataService;
@@ -32,7 +31,6 @@ public class EnumsDataServiceImpl implements EnumsDataService {
                 .addEnums("questionTypeEnum", QuestionTypeEnum.values())
                 .addEnums("introducePositionEnum", IntroducePositionEnum.values())
                 .addEnums("disclaimerCodeEnum", DisclaimerCodeEnum.values())
-                .addEnums("moduleTypeEnum", ModuleTypeEnum.values())
                 .addEnums("questionUsualTypeEnum", QuestionUsualTypeEnum.values())
                 .addEnums("dataSourcesEnums", QuestionUsualTypeEnum.values())
                 .addEnums("moduleInfoTypeEnum", ModuleInfoTypeEnum.values())

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

@@ -17,7 +17,7 @@ public class AddModuleInfoVO {
     @NotNull(message="模板名称不能为空")
     private String name;
     @NotNull(message="模板归属不能为空")
-    private int type;
+    private String type;
     //特殊标签归属类型
     private Integer textType;
     //标签id

icssman-service/src/main/java/com/diagbot/vo/DeleteScaleVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: ztg
+ * @time: 2019/1/28 15:45
+ */
+@Getter
+@Setter
+public class DeleteScaleVO {
+    private List<Long> ids;
+}

icssman-service/src/main/java/com/diagbot/vo/GetModuleInfoVO.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Setter
 public class GetModuleInfoVO extends Page {
     //模板归属
-    private Integer type;
+    private String type;
     //模板类型
     private Integer moduleType;
     //关联id

icssman-service/src/main/java/com/diagbot/vo/GetModuleTypeVO.java

@@ -15,6 +15,5 @@ import javax.validation.constraints.NotNull;
 public class GetModuleTypeVO {
     @NotNull(message = "请输入moduleType")
     private Long moduleType;
-    @NotNull(message = "请输入relationId")
     private Long relationId;
 }

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

@@ -146,7 +146,7 @@ public class ModuleInfoController {
         return RespDTO.onSuc(date);
     }
 
-    @ApiOperation(value = "2期-获取模板Type[主诉到诊断][by:wangyu]",
+    @ApiOperation(value = "2期-获取模板Type[主诉到诊断]（修改获取类型用）[by:wangyu]",
             notes = "moduleType: 模板mouduleType，必填<br>" +
                     "")
     @PostMapping("/getModuleType")
@@ -156,7 +156,7 @@ public class ModuleInfoController {
         return RespDTO.onSuc(date);
     }
 
-    @ApiOperation(value = "2期-获取科室和疾病所有信息[by:wangyu]",
+    @ApiOperation(value = "2期-获取科室和疾病所有信息（主页面下拉用）[by:wangyu]",
             notes = "")
     @PostMapping("/getAllDeptAndDisInfo")
     @SysLogger("getAllDeptAndDisInfo")

icssman-service/src/main/java/com/diagbot/web/ScaleContentController.java

@@ -6,6 +6,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.QuestionPageDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ScaleContentFacade;
+import com.diagbot.vo.DeleteScaleVO;
 import com.diagbot.vo.QuestionPageVO;
 import com.diagbot.vo.ScaleContentSaveVO;
 import io.swagger.annotations.Api;
@@ -51,4 +52,14 @@ public class ScaleContentController {
         IPage<QuestionPageDTO> data = scaleContentFacade.getListFac(questionPageVO);
         return RespDTO.onSuc(data);
     }
+
+
+    @ApiOperation(value = "2期-量表内容删除[by:zhoutg]",
+            notes = "")
+    @PostMapping("/delete")
+    @SysLogger("delete")
+    public  RespDTO<Boolean> delete(@RequestBody DeleteScaleVO deleteScaleVO) {
+        scaleContentFacade.delete(deleteScaleVO);
+        return RespDTO.onSuc(true);
+    }
 }