排序

src/main/java/com/diagbot/dto/MsgDTO.java

@@ -13,6 +13,8 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 public class MsgDTO {
+    //明细主键
+    private Long id;
     //得分
     private BigDecimal score;
     //提示信息

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -135,7 +135,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         List<QcCasesEntryDTO> qcCasesEntryDTOList = qcCasesEntryFacade.getQcCasesEntry(analyzeVO);
 
         // 获取病历所有数据
-        Map<Long, Map<String, String>> dicMap = sysDictionaryFacade.getDictionaryWithKey(); // 获取字典信息
+        Map<String, Map<String, String>> dicMap = sysDictionaryFacade.getDictionaryWithKey(); // 获取字典信息
         // 获取文书信息
         RecordContentVO recordContentVO = new RecordContentVO();
         BeanUtil.copyProperties(analyzeVO, recordContentVO);
@@ -204,7 +204,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                         "术前讨论、术前小结", "手术知情同意书", "手术安全核查表"));
 
         // 医嘱
-        addDataWithKeyConvert("医嘱信息", doctorAdviceList, medrecVoList, dicMap.get(1));
+        addDataWithKeyConvert("医嘱信息", doctorAdviceList, medrecVoList, dicMap.get("1"));
 
         // 病案首页
         addDataWithFirstPage("病案首页",  homePage, medrecVoList, dicMap,
@@ -333,7 +333,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-
         }
 
         content.put("content", contents);
@@ -351,7 +350,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
      * @param homeDiagnoseInfoList
      * @param homeOperationInfoList
      */
-    public void addDataWithFirstPage(String key,  HomePage homePage, List<MedrecVo> medrecVoList, Map<Long, Map<String, String>> dicMap,
+    public void addDataWithFirstPage(String key,  HomePage homePage, List<MedrecVo> medrecVoList, Map<String, Map<String, String>> dicMap,
                                      List<HomeDiagnoseInfo> homeDiagnoseInfoList, List<HomeOperationInfo> homeOperationInfoList) {
         MedrecVo medrecVo = new MedrecVo();
         medrecVo.setTitle(key);

src/main/java/com/diagbot/facade/SysDictionaryFacade.java

@@ -44,8 +44,8 @@ public class SysDictionaryFacade extends SysDictionaryInfoServiceImpl {
      * @return
      */
     @Cacheable(value = "cache", key = "'qcdict'")
-    public Map<Long, Map<String, String>> getDictionaryWithKey() {
-        Map<Long, Map<String, String>> res = new HashMap<>();
+    public Map<String, Map<String, String>> getDictionaryWithKey() {
+        Map<String, Map<String, String>> res = new HashMap<>();
         List<SysDictionaryInfo> list = this.list(new QueryWrapper<SysDictionaryInfo>()
                 .in("return_type", ListUtil.arrayToList(new Long[] { 0L, 2L }))
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -56,7 +56,7 @@ public class SysDictionaryFacade extends SysDictionaryInfoServiceImpl {
             for (SysDictionaryInfo dic : mapSource.get(group)) {
                 m.put(dic.getName(), dic.getVal());
             }
-            res.put(group, m);
+            res.put(String.valueOf(group), m);
         }
         return res;
     }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -62,13 +62,14 @@
     </select>
 
     <select id="getMsg" resultType="com.diagbot.dto.MsgDTO">
-        SELECT b.`name` model_name,c.score,c.msg,c.cases_entry_id,c.is_reject
+        SELECT b.`name` model_name,c.score,c.msg,c.cases_entry_id,c.is_reject,c.id id
         FROM `qc_cases_entry` a, qc_mode b, med_qcresult_detail c
         where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N'
         and a.id = c.cases_entry_id
         and a.mode_id = b.id
         and c.hospital_id = #{hospitalId}
         and c.behospital_code = #{behospitalCode}
+        order by a.order_no
     </select>
 
 </mapper>