Merge branch 'dev-1.2' into dev

dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/comsis/XmlDataAnalysisFacade.java

@@ -278,6 +278,13 @@ public class XmlDataAnalysisFacade {
     private List<Map.Entry<Set<String>, String>> getKeysBehospitalCodeEntryList(long hospitalId, long modelId, String recTitle, String sex, List<String> recIds, Map<String, String> recIdBehospitalCodeMap, EncrypDES encrypDES) throws Exception {
         List<Map.Entry<Set<String>, String>> ret = Lists.newArrayList();
 
+        QueryWrapper<MedicalRecord> medicalRecordQe = new QueryWrapper<>();
+        medicalRecordQe.eq("hospital_id",hospitalId);
+        medicalRecordQe.in("rec_id",recIds);
+        MedicalRecord medicalRecord = new MedicalRecord();
+        medicalRecord.setStatus(1);
+        medicalRecordService.update(medicalRecord,medicalRecordQe);
+
         //根据文书记录id集合，找出文书内容，有的文书记录可能没有对应文书内容，如果文书的xml是加密过的，还需要解密
         QueryWrapper<MedicalRecordContent> medicalRecordContentQe = new QueryWrapper<>();
         medicalRecordContentQe.eq("is_deleted", "N");

trans/src/main/java/com/lantone/qc/trans/changx/ChangxDocTrans.java

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.model.vo.QueryVo;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.trans.DocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 
 import java.util.List;
 import java.util.Map;
@@ -164,7 +165,13 @@ public class ChangxDocTrans extends DocTrans {
             inputInfo.setClinicalBloodDocs(inputInfo.getClinicalBloodDocs().stream().filter(i -> i.getText().indexOf("输白蛋白") == -1).collect(Collectors.toList()));
         }
         if (ListUtil.isNotEmpty(inputInfo.getClinicBloodEffectDocs())) {
-            inputInfo.getPageData().put("输血后效果评价", inputInfo.getClinicBloodEffectDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+            inputInfo.getPageData().put(
+                    "输血后效果评价",
+                    inputInfo.getClinicBloodEffectDocs()
+                            .stream()
+                            .map(i -> i.getPageData())
+                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm"))
+                            .collect(Collectors.toList()));
         }
         if (ListUtil.isNotEmpty(inputInfo.getCrisisValueReportDocs())) {
             inputInfo.getPageData().put("危急值记录", inputInfo.getCrisisValueReportDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));

trans/src/main/java/com/lantone/qc/trans/comsis/OrdinaryAssistant.java

@@ -2,9 +2,11 @@ package com.lantone.qc.trans.comsis;
 
 import com.google.common.collect.Maps;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
+import com.lantone.qc.pub.util.DateUtil;
 import com.lantone.qc.pub.util.MapUtil;
 import com.lantone.qc.pub.util.StringUtil;
 
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -37,7 +39,7 @@ public class OrdinaryAssistant {
                 targetKey = arry[1];
             }
             if (StringUtil.isNotBlank(sourceMap_.get(sourceKey))
-                    &&(!retMap.containsKey(targetKey)||StringUtil.isBlank(retMap.get(targetKey)))) {
+                    && (!retMap.containsKey(targetKey) || StringUtil.isBlank(retMap.get(targetKey)))) {
                 retMap.put(targetKey, sourceMap_.get(sourceKey));
             }
             removeKey.add(sourceKey);
@@ -53,4 +55,34 @@ public class OrdinaryAssistant {
         return retMap;
     }
 
+    /**
+     * 返回给前端的页面数据多条时排序
+     *
+     * @param map1
+     * @param map2
+     * @param key
+     * @param format
+     * @return
+     */
+    public static int pageDataTimeSort(Map<String, Object> map1, Map<String, Object> map2, String key, String format) {
+        Date date1 = null, date2 = null;
+        if (map1.get(key) != null) {
+            date1 = DateUtil.parseDate(map1.get(key).toString(), format);
+        }
+        if (map2.get(key) != null) {
+            date2 = DateUtil.parseDate(map2.get(key).toString(), format);
+        }
+        long time1 = date1 == null ? 0 : date1.getTime();
+        long time2 = date2 == null ? 0 : date2.getTime();
+
+        if (time1 == time2) {
+            return 0;
+        }
+        if (time1 > time2) {
+            return -1;
+        } else {
+            return 1;
+        }
+    }
+
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaizhouDocTrans.java

@@ -4,11 +4,10 @@ import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.model.vo.QueryVo;
-import com.lantone.qc.pub.util.DateUtil;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.trans.DocTrans;
+import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -167,7 +166,7 @@ public class TaizhouDocTrans extends DocTrans {
                     inputInfo.getCrisisValueReportDocs()
                             .stream()
                             .map(i -> i.getPageData())
-                            .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "病历日期", "yyyy-MM-dd HH:mm"))
+                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "病历日期", "yyyy-MM-dd HH:mm"))
                             .collect(Collectors.toList())
             );
         }
@@ -189,7 +188,7 @@ public class TaizhouDocTrans extends DocTrans {
                     inputInfo.getRescueDocs()
                             .stream()
                             .map(i -> i.getPageData())
-                            .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "事件日期", "yyyy/MM/dd HH:mm"))
+                            .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "事件日期", "yyyy/MM/dd HH:mm"))
                             .collect(Collectors.toList())
             );
         }
@@ -212,7 +211,7 @@ public class TaizhouDocTrans extends DocTrans {
                     .stream()
                     .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationRecordDoc() != null)
                     .map(consultationDoc -> consultationDoc.getConsultationRecordDoc().getPageData())
-                    .sorted((map1, map2) -> -pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm"))
+                    .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "记录时间", "yyyy/MM/dd HH:mm"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(crePageDataList)) {
                 inputInfo.getPageData().put("会诊记录", crePageDataList);
@@ -222,7 +221,7 @@ public class TaizhouDocTrans extends DocTrans {
                     .stream()
                     .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationApplicationDoc() != null)
                     .map(consultationDoc -> consultationDoc.getConsultationApplicationDoc().getPageData())
-                    .sorted((map1, map2) -> -pageDataTimeSort(map1, map2, "申请日期", "yyyy/MM/dd HH:mm"))
+                    .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "申请日期", "yyyy/MM/dd HH:mm"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(caPageDataList)) {
                 inputInfo.getPageData().put("会诊申请单", caPageDataList);
@@ -232,7 +231,7 @@ public class TaizhouDocTrans extends DocTrans {
                     .stream()
                     .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationResultsDoc() != null)
                     .map(consultationDoc -> consultationDoc.getConsultationResultsDoc().getPageData())
-                    .sorted((map1, map2) -> -pageDataTimeSort(map1, map2, "申请日期", "yyyy/MM/dd HH:mm"))
+                    .sorted((map1, map2) -> -OrdinaryAssistant.pageDataTimeSort(map1, map2, "申请日期", "yyyy/MM/dd HH:mm"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(crsPageDataList)) {
                 inputInfo.getPageData().put("会诊结果单", crsPageDataList);
@@ -243,7 +242,7 @@ public class TaizhouDocTrans extends DocTrans {
                     .stream()
                     .filter(operationDoc -> operationDoc != null && operationDoc.getOperationDiscussionDoc() != null)
                     .map(operationDoc -> operationDoc.getOperationDiscussionDoc().getPageData())
-                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "手术日期", "yyyy/MM/dd"))
+                    .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "手术日期", "yyyy/MM/dd"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(odPageDataList)) {
                 inputInfo.getPageData().put("术后首次病程及谈话记录", odPageDataList);
@@ -253,7 +252,7 @@ public class TaizhouDocTrans extends DocTrans {
                     .stream()
                     .filter(operationDoc -> operationDoc != null && operationDoc.getOperationRecordDoc() != null)
                     .map(operationDoc -> operationDoc.getOperationRecordDoc().getPageData())
-                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "开始时间", "yyyy/MM/dd HH:mm"))
+                    .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "开始时间", "yyyy/MM/dd HH:mm"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(orPageDataList)) {
                 inputInfo.getPageData().put("手术记录", orPageDataList);
@@ -263,7 +262,7 @@ public class TaizhouDocTrans extends DocTrans {
                     .stream()
                     .filter(operationDoc -> operationDoc != null && operationDoc.getPreoperativeDiscussionDoc() != null)
                     .map(operationDoc -> operationDoc.getPreoperativeDiscussionDoc().getPageData())
-                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "讨论时间", "yyyy年MM月dd日 HH时mm分"))
+                    .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "讨论时间", "yyyy年MM月dd日 HH时mm分"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(pdPageDataList)) {
                 inputInfo.getPageData().put("术前讨论、术前小结", pdPageDataList);
@@ -273,7 +272,7 @@ public class TaizhouDocTrans extends DocTrans {
                     .stream()
                     .filter(operationDoc -> operationDoc != null && operationDoc.getOperationInformedConsentDoc() != null)
                     .map(operationDoc -> operationDoc.getOperationInformedConsentDoc().getPageData())
-                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "谈话日期", "yyyy/MM/dd HH:mm"))
+                    .sorted((map1, map2) -> OrdinaryAssistant.pageDataTimeSort(map1, map2, "谈话日期", "yyyy/MM/dd HH:mm"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(oicPageDataList)) {
                 inputInfo.getPageData().put("手术知情同意书", oicPageDataList);
@@ -290,34 +289,4 @@ public class TaizhouDocTrans extends DocTrans {
         }
     }
 
-    /**
-     * 返回给前端的页面数据多条时排序
-     *
-     * @param map1
-     * @param map2
-     * @param key
-     * @param format
-     * @return
-     */
-    private int pageDataTimeSort(Map<String, Object> map1, Map<String, Object> map2, String key, String format) {
-        Date date1 = null, date2 = null;
-        if (map1.get(key) != null) {
-            date1 = DateUtil.parseDate(map1.get(key).toString(), format);
-        }
-        if (map2.get(key) != null) {
-            date2 = DateUtil.parseDate(map2.get(key).toString(), format);
-        }
-        long time1 = date1 == null ? 0 : date1.getTime();
-        long time2 = date2 == null ? 0 : date2.getTime();
-
-        if (time1 == time2) {
-            return 0;
-        }
-        if (time1 > time2) {
-            return -1;
-        } else {
-            return 1;
-        }
-    }
-
 }