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

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

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -48,6 +49,8 @@ public class ClinicalFacade {
         SearchVo sData = searchVo;
 
         sData.setLisArr(processLis(sData.getLisArr()));
+        List<String> otherVal=sData.getLisArr().stream().map(lisArr->lisArr.getOtherValue()).collect(Collectors.toList());
+        sData.setLis(otherVal.toString());
 
         Response<ResponseData> res = aiServiceClient.bayesPageData(sData);
         if (res == null || res.getData() == null) {

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

@@ -2,6 +2,7 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.entity.ScaleContent;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ScaleTypeEnum;
 import com.diagbot.service.impl.ScaleContentServiceImpl;
 import com.diagbot.vo.PushVO;
@@ -48,6 +49,7 @@ public class ScaleContentFacade extends ScaleContentServiceImpl {
         //获取内容列表
         List<ScaleContent> data = this.list(new QueryWrapper<ScaleContent>()
                 .eq("scale_id", scaleId)
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .orderByAsc("order_no"));
 
         //看需是否要调用大数据

icss-service/src/main/java/com/diagbot/web/IndexDataController.java

@@ -38,7 +38,7 @@ public class IndexDataController {
     @Autowired
     IndexDataFacade indexDataFacade;
 
-    @ApiOperation(value = "2期-根据疾病Id获取指标配置[by:wangfeng]", notes = "diseaseId：疾病Id 必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
+    @ApiOperation(value = "2期-根据疾病Id获取指标数据[by:wangfeng]", notes = "diseaseId：疾病Id 必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
     @PostMapping("/getIndexDatas")
     @SysLogger("getIndexDatas")
     public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {

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

@@ -9,6 +9,7 @@ import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.QuestionPageDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.ScaleContentDTO;
+import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -45,6 +46,8 @@ public class ScaleContentFacade extends ScaleContentServiceImpl {
     ScaleContentService scaleContentService;
     @Autowired
     UserServiceClient userServiceClient;
+    @Autowired
+    QuestionFacade questionFacade;
 
     /**
      * 量表内容新增或更新
@@ -55,7 +58,14 @@ public class ScaleContentFacade extends ScaleContentServiceImpl {
         Long scaleId = scaleContentSaveVO.getScaleId();
         Date now = DateUtil.now();
         String userId = UserUtils.getCurrentPrincipleID();
-        //删除原关联内容
+
+        // 更新修改信息
+        questionFacade.update(new QuestionInfo(), new UpdateWrapper<QuestionInfo>()
+                .eq("id", scaleId)
+                .set("gmt_modified", now)
+                .set("modifier", userId)
+        );
+        // 删除原关联内容
         if (scaleId != null) {
             this.update(new ScaleContent(), new UpdateWrapper<ScaleContent>()
                     .eq("scale_id", scaleId)
@@ -64,7 +74,7 @@ public class ScaleContentFacade extends ScaleContentServiceImpl {
                     .set("modifier", userId)
                     .set("is_deleted", IsDeleteEnum.Y.getKey()));
         }
-        //新增关联内容
+        // 新增关联内容
         List<ScaleContent> list = new ArrayList<>();
         List<ScaleContentVO> scaleContentVOS = scaleContentSaveVO.getContent();
         for (ScaleContentVO scaleContentVO : scaleContentVOS) {