电子病历评级相关接口

config-server/src/main/resources/shared/icss-service-local.yml

@@ -8,7 +8,7 @@ spring:
       driverClassName: com.mysql.jdbc.Driver
       driver-class-name: com.mysql.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-icssncd?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息

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

@@ -15,6 +15,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.IntroduceInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.EMRIntroduceVO;
 import com.diagbot.vo.HosCodeVO;
@@ -189,7 +190,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         if (titles.length > 0) {
             for (String title : titles) {
                 String uniqueTitle = titleMappingMap.get(title);
-                titleMapping.put(title, uniqueName);
+                titleMapping.put(title, uniqueTitle);
                 if (StringUtil.isNotBlank(uniqueTitle)) {
                     uniqueTitleList.add(uniqueTitle);
                 }
@@ -205,9 +206,9 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "公表标签不存在");
         }
 
+
         QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
         introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("question_id", questionInfo.getId()).
                 eq("type", type);
         IntroduceMap introduceMap = introduceMapFacade.getOne(introduceMapQueryWrapper);
         if (introduceMap == null) {
@@ -229,17 +230,21 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         }
         List<IntroduceDetail> introduceDetailList = introduceDetailFacade.list(introduceDetailQueryWrapper);
         List<EMRIntroduceDetailDTO> retList = Lists.newLinkedList();
-        for (Map.Entry<String, String> entry : titleMapping.entrySet()) {
-            EMRIntroduceDetailDTO detailDTO = new EMRIntroduceDetailDTO();
-            detailDTO.setTitle(entry.getKey());
-            if (StringUtil.isNotBlank(entry.getValue())) {
-                for (IntroduceDetail introduceDetail : introduceDetailList) {
-                    if (entry.getValue().equals(introduceDetail.getTitle())) {
-                        detailDTO.setText(introduceDetail.getText());
+        if (emrIntroduceVO.getTitles().length > 0) {
+            for (Map.Entry<String, String> entry : titleMapping.entrySet()) {
+                EMRIntroduceDetailDTO detailDTO = new EMRIntroduceDetailDTO();
+                detailDTO.setTitle(entry.getKey());
+                if (StringUtil.isNotBlank(entry.getValue())) {
+                    for (IntroduceDetail introduceDetail : introduceDetailList) {
+                        if (entry.getValue().equals(introduceDetail.getTitle())) {
+                            detailDTO.setText(introduceDetail.getText());
+                        }
                     }
                 }
+                retList.add(detailDTO);
             }
-            retList.add(detailDTO);
+        } else {
+            retList = BeanUtil.listCopyTo(introduceDetailList, EMRIntroduceDetailDTO.class);
         }
         return retList;
     }

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

@@ -33,19 +33,19 @@ public class EMRController {
     @Autowired
     PushFacade pushFacade;
 
-    @ApiOperation(value = "获取电子病历评级提示信息[by:zhaops]",
-            notes = "hosCode: 医院编码，必填<br>" +
-                    "type: 检验检查类型，5-检验，6-检查，单选必填<br>" +
-                    "mealName: 套餐名称（检验检查），必填<br>" +
-                    "itemName: 项目名称（检验）<br>" +
-                    "titles(数组): 提示信息标题列表<br>")
+    @ApiOperation(value = "电子病历解读[by:zhaops]",
+            notes = "hosCode: 医院编码，必填，String<br>" +
+                    "type: 检验检查类型，5-检验，6-检查，单选必填，Integer<br>" +
+                    "name: 套餐名称（检验检查），必填，String<br>" +
+                    "detailName: 项目名称（检验选填，检查不填），String<br>" +
+                    "titles: 提示信息标题列表，String数组<br>")
     @PostMapping("/getIntroduceByEMR")
     public RespDTO<List<EMRIntroduceDetailDTO>> getIntroduceByEMR(@RequestBody EMRIntroduceVO emrIntroduceVO) {
         List<EMRIntroduceDetailDTO> data = introduceInfoFacade.getIntroduceByEMR(emrIntroduceVO);
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "推理接口-电子病历评级[by:zhaops]",
+    @ApiOperation(value = "推理[by:zhaops]",
             notes = "hosCode： 医院编码(必填)<br>" +
                     "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，1：男，2：女<br>" +
@@ -61,10 +61,10 @@ public class EMRController {
                     "lis：minValue：最小值,Double<br>" +
                     "lis：units：单位,String<br>" +
                     "lis：otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
-                    "lis：source：数据来源（必填）,Integer<br>" +
+                    "lis：source：数据来源（必填）0-内部来源，1-外部来源,Integer<br>" +
                     "pacs：辅检,String<br>" +
                     "diag：诊断,String<br>" +
-                    "featureType：类型(多选必填)，5：化验，6：辅检,String<br>")
+                    "featureType：类型(多选必填)，5：检验，6：检查,String<br>")
     @PostMapping("/pushEMR")
     @SysLogger("pushEMR")
     public RespDTO<PushEMRDTO> pushEMR(@RequestBody @Valid EMRPushVO emrPushVO) {