Prechádzať zdrojové kódy

经典病例后台完整功能+相似病例

xiewei 10 mesiacov pred
rodič
commit
f9a4c228d9

+ 1 - 1
cdssman-service/src/main/java/com/diagbot/enums/DiseaseRelationTypeEnum.java

@@ -21,7 +21,7 @@ public enum DiseaseRelationTypeEnum implements KeyedNamed {
     disDifferentDis(508, "100&508&100"),
     disLiangbiao(509, "100&509&124"),
     disNurse(510, "100&510&123"),
-    ;
+    disClassicCase(516, "100&516&411");
 
 
     @Setter

+ 2 - 1
cdssman-service/src/main/java/com/diagbot/enums/RelationLibTypeEnum.java

@@ -25,7 +25,8 @@ public enum RelationLibTypeEnum implements KeyedNamed {
     relationPart(512,"122"),
     relationSystem(513,"307"),
     relationAccSymptom(514,"103"),
-    relationNature(515,"126");
+    relationNature(515,"126"),
+    relationClassicCase(516,"411");
 
 
     @Setter

+ 4 - 2
cdssman-service/src/main/java/com/diagbot/facade/KlDiseaseFacade.java

@@ -40,6 +40,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.LinkedHashMap;
 import java.util.stream.Collectors;
 
 
@@ -106,12 +107,13 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
      * @return
      */
     public DiseaseTreeDetailDTO getDetail(GetDiseaseDetailVO getDiseaseDetailVO) {
-        List<Integer> relations = Arrays.asList(501, 502, 503, 504, 505, 506, 507, 508, 509,510);
+        List<Integer> relations = Arrays.asList(501, 502, 503, 504, 505, 506, 507, 508, 509,510,516);
         List<KlLexiconRelationship> klLexiconRelationships = klLexiconRelationshipFacade.list(new QueryWrapper<KlLexiconRelationship>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("code", relations)
                 .orderByAsc("code"));
-        Map<Integer, String> relation_name = klLexiconRelationships.stream().collect(Collectors.toMap(KlLexiconRelationship::getCode, KlLexiconRelationship::getName, (key1, key2) -> key2));
+        Map<Integer, String> relation_name = klLexiconRelationships.stream().collect(Collectors.toMap(KlLexiconRelationship::getCode, KlLexiconRelationship::getName, (key1, key2) -> key2, LinkedHashMap::new));
+        //Map<Integer, String> relation_name = klLexiconRelationships.stream().collect(Collectors.toMap(KlLexiconRelationship::getCode, KlLexiconRelationship::getName, (key1, key2) -> key2),LinkedHashMap::new);
         DiseaseTreeDetailDTO diseaseTreeDetailDTO = new DiseaseTreeDetailDTO();
 
         DiseaseDetailDTO diseaseDetailDTO = new DiseaseDetailDTO();

+ 0 - 18
cdssman-service/src/main/java/com/diagbot/facade/MappingConfigFacade.java

@@ -257,24 +257,6 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
         return page;
     }
 
-    /**
-     * 分页查询经典病例
-     *
-     * @param mappingConfigPageVO
-     * @return
-     */
-    public IPage<MappingCaseWrapper> getClassicCase(MappingConfigPageVO mappingConfigPageVO) {
-        Page<MappingCaseWrapper> page = null;
-        RespDTO<Page<MappingCaseWrapper>> respDTO = cdssClient.getClassicCase(mappingConfigPageVO);
-        if (RespDTOUtil.respIsOK(respDTO)) {
-            page = respDTO.data;
-        } else {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, respDTO.msg);
-        }
-
-        return page;
-    }
-
     /**
      * 导入模板下载
      *

+ 7 - 9
cdssman-service/src/main/java/com/diagbot/web/ConceptInfoController.java

@@ -69,8 +69,8 @@ public class ConceptInfoController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "获取经典病列表",
-            notes = "type: 类型:11-经典病 <br>" +
+    @ApiOperation(value = "获取经典病列表",
+            notes = "type: 类型:11-经典病 <br>" +
                     "name: 术语名称<br>" +
                     "status: 启用状态:1-启用、0-禁用<br>")
     @PostMapping("/getClassicCase")
@@ -97,12 +97,10 @@ public class ConceptInfoController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "保存经典病-新增或修改",
+    @ApiOperation(value = "保存经典病-新增或修改",
             notes = "id: id <br>" +
                     "name: 术语名称 <br>" +
-                    "type: 类型:11-经典病历  <br>" +
-                    "clinicalPathwayName: 临床路径名称<br>" +
-                    "noticeName: 注意事项名称<br>" +
+                    "type: 类型:11-经典病例  <br>" +
                     "source:数据来源:0-医院端、1-云平台,默认0 <br>" +
                     "details: 明细<br>" +
                     "scale:评估量表<br>")
@@ -125,7 +123,7 @@ public class ConceptInfoController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "经典病启用禁用",
+    @ApiOperation(value = "经典病启用禁用",
             notes = "id: 术语id <br>" +
                     "status: 启用状态:1-启用、0-禁用<br>")
     @PostMapping("/changeCaseStatus")
@@ -155,8 +153,8 @@ public class ConceptInfoController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "根据经典病历id获取病历信息[zhaops]",
-            notes = "id: 术语id <br>")
+    @ApiOperation(value = "根据病例id获取病例信息",
+            notes = "id: 病例id <br>")
     @PostMapping("/getCaseById")
     @SysLogger("getCaseById")
     public RespDTO<KlClassicCaseDTO> getCaseById(@Valid @RequestBody IdVO idVO) {

+ 0 - 15
cdssman-service/src/main/java/com/diagbot/web/MappingConfigController.java

@@ -129,21 +129,6 @@ public class MappingConfigController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "分页查询经典病历",
-            notes = "hospitalId(必填):医院id <br>" +
-                    "isMatch(选填,默认全部):是否匹配(0-未匹配、1-已匹配、2-多条匹配) <br>" +
-                    "hisName(必填):医院术语名称 <br>" +
-                    "uniqueName(选填,可为空):标准术语名称 <br>" +
-                    "type(必填): 类型:11-经典病例 <br>")
-    @PostMapping("/getClassicCase")
-    @SysLogger("getClassicCase")
-    public RespDTO<Page<MappingCaseWrapper>> getClassicCase(@RequestBody @Valid MappingConfigPageVO mappingConfigPageVO) {
-        IPage<MappingCaseWrapper> data = mappingConfigFacade.getClassicCase(mappingConfigPageVO);
-        Page<MappingCaseWrapper> page = new Page<>();
-        BeanUtil.copyProperties(data, page);
-        return RespDTO.onSuc(data);
-    }
-
     @ApiOperation(value = "获取映射关系[by:zhaops]",
             notes = "id:关联关系id")
     @PostMapping("/getRecord")

+ 1 - 1
cdssman-service/src/main/resources/mapper/KlDiseaseMapper.xml

@@ -141,7 +141,7 @@
                 #{item}
             </foreach>
         </if>-->
-        AND kr.relation_id IN (501,502,503,504,505,506,507,508,509,510)
+        AND kr.relation_id IN (501,502,503,504,505,506,507,508,509,510,516)
         ORDER BY
         rid,kro.order_no
     </select>