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

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

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.print.attribute.standard.MediaSize;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,13 @@ public class ClinicalFacade {
     @Autowired
     private AIServiceClient aiServiceClient;
 
+    private static String up = "增高";
+    private static String down = "降低";
+    private static String normal = "正常";
+
+    private static String pos = "阳性";
+    private static String neg = "阴性";
+
     /**
      * 处理临床数据
      *
@@ -36,34 +44,42 @@ public class ClinicalFacade {
      * @return ResponseData
      */
     public ResponseData processClinicalData(@RequestBody SearchVo searchVo) {
-        processLis(searchVo);
-        Response<ResponseData> res = aiServiceClient.bayesPageData(searchVo);
+        SearchVo sData = searchVo;
+
+        sData.setLisArr(processLis(sData.getLisArr()));
+
+        Response<ResponseData> res = aiServiceClient.bayesPageData(sData);
 
         return res.getData();
     }
 
-    private void processLis(SearchVo sData) {
+    private List<LisResult> processLis(List<LisResult> lisArr) {
 
         String Otherval = "";
-        String lisresult = "";
-        List<LisResult> lisArr = sData.getLisArr();
 
         for (int i = 0; i < lisArr.size(); i++) {
             LisResult lisres = lisArr.get(i);
 
             Otherval = (lisres.getOtherValue().trim().length() > 0) ? lisres.getOtherValue().trim() + "\n" : "";
+            Otherval = lisres.getOtherValue();
 
-            if (lisres.getMaxValue() != null && lisres.getValue() > lisres.getMaxValue()) {
-                lisres.setOtherValue(Otherval + "\n" + lisres.getDetailName() + "升高");
-
+            if (Otherval.indexOf(pos) >= 0 || Otherval.indexOf(neg) >= 0) {
+                lisres.setOtherValue(lisres.getDetailName() + Otherval);
             }
-            else if (lisres.getMinValue() != null && lisres.getValue() < lisres.getMinValue()) {
-                lisres.setOtherValue(Otherval + "\n" + lisres.getDetailName() + "下降");
+            else {
+                Otherval = (Otherval.trim().length() > 0) ? Otherval.trim() + "\n" : "";
+
+                if (lisres.getMaxValue() != null && lisres.getValue() > lisres.getMaxValue()) {
+                    lisres.setOtherValue(Otherval + lisres.getDetailName() + up);
+                } else if (lisres.getMinValue() != null && lisres.getValue() < lisres.getMinValue()) {
+                    lisres.setOtherValue(Otherval + lisres.getDetailName() + down);
+                } else {
+                    lisres.setOtherValue(Otherval + lisres.getDetailName() + normal);
+                }
             }
-            lisresult += lisres.getOtherValue() + "\n";
         }
 
-        sData.setLis(lisresult);
+        return lisArr;
     }
 
     /**

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

@@ -122,8 +122,12 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         List<Long> questionIds = introduceVO.getMapVOList().stream().map(introduceMapVO -> introduceMapVO.getQuestionId()).collect(Collectors.toList());
         Long introudceId = introduceInfo.getId();
         UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
-        introduceMapUpdateWrapper.and(i -> i.eq("introduce_id", introudceId).or().in("question_id", questionIds)).
-                eq("is_deleted", IsDeleteEnum.N.getKey()).
+        if (ListUtil.isNotEmpty(questionIds)) {
+            introduceMapUpdateWrapper.and(i -> i.eq("introduce_id", introudceId).or().in("question_id", questionIds));
+        } else {
+            introduceMapUpdateWrapper.eq("introduce_id", introudceId);
+        }
+        introduceMapUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                 set("is_deleted", IsDeleteEnum.Y.getKey()).
                 set("modifier", UserUtils.getCurrentPrincipleID()).
                 set("gmt_modified", DateUtil.now());
@@ -193,6 +197,9 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
      */
     public Boolean deleteRecords(List<IdVO> idVOList) {
         List<Long> ids = idVOList.stream().map(idVO -> idVO.getId()).collect(Collectors.toList());
+        if (ListUtil.isEmpty(ids)) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入提示信息id");
+        }
         //删除已有映射关系
         UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
         introduceMapUpdateWrapper.in("introduce_id", ids).
@@ -277,7 +284,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         List<IntroduceMap> introduceMapList = introduceMapFacade.list(introduceMapQueryWrapper);
 
         List<Long> questionIds = introduceMapList.stream().map(introduceMap -> introduceMap.getQuestionId()).collect(Collectors.toList());
-        if(ListUtil.isNotEmpty(questionIds)) {
+        if (ListUtil.isNotEmpty(questionIds)) {
             QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
             questionInfoQueryWrapper.in("id", questionIds).eq("is_deleted", IsDeleteEnum.N.getKey());
             List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
@@ -309,9 +316,9 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         introducePageDTO.setUnRelatedQuestionList(unRelatedQuestionDTOList);*/
 
         //提示信息明细
-        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper=new QueryWrapper<>();
-        introduceDetailQueryWrapper.eq("is_deleted",IsDeleteEnum.N).eq("introduce_id",id).orderByAsc("order_no");
-        List<IntroduceDetail> introduceDetailList=introduceDetailFacade.list(introduceDetailQueryWrapper);
+        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
+        introduceDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N).eq("introduce_id", id).orderByAsc("order_no");
+        List<IntroduceDetail> introduceDetailList = introduceDetailFacade.list(introduceDetailQueryWrapper);
         introducePageDTO.setDetails(introduceDetailList);
 
         return introducePageDTO;

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

@@ -155,7 +155,9 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
             moduleDetail.setGmtCreate(now);
             moduleDetail.setGmtModified(now);
             moduleDetail.setOrderNo(i+1);
-            moduleDetail.setRelationModule(addModuleInfoVO.getModelDetils().get(i).getRelationModule());
+            if(addModuleInfoVO.getModelDetils().get(i).getRelationModule() != null){
+                moduleDetail.setRelationModule(addModuleInfoVO.getModelDetils().get(i).getRelationModule());
+            }
             if (StringUtil.isNotEmpty(addModuleInfoVO.getModelDetils().get(i).getText())){
                 moduleDetail.setQuestionId(questionIdMap.get(addModuleInfoVO.getModelDetils().get(i).getText()));
             }else {
@@ -164,7 +166,13 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
             if(StringUtil.isNotEmpty(addModuleInfoVO.getModelDetils().get(i).getFlag())){
                 moduleDetail.setFlag(addModuleInfoVO.getModelDetils().get(i).getFlag());
             }
-            moduleDetailList.add(moduleDetail);
+            //判断是否是有效数据
+            if(addModuleInfoVO.getModelDetils().get(i).getRelationModule() != null
+                || StringUtil.isNotEmpty(addModuleInfoVO.getModelDetils().get(i).getText())
+                || StringUtil.isNotEmpty(addModuleInfoVO.getModelDetils().get(i).getFlag())
+                || addModuleInfoVO.getModelDetils().get(i).getQuestionId() != null ){
+                moduleDetailList.add(moduleDetail);
+            }
         }
         //添加模板明细
         moduleDetailService.saveBatch(moduleDetailList);