Browse Source

入院记录文书结构化调整

chengyao 4 years ago
parent
commit
bff396d7cf

+ 2 - 1
src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -353,7 +353,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("hospital_id", hospitalId)
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
                 .select("whole_data", "rec_id", "hospital_id")
                 .select("whole_data", "rec_id", "hospital_id")
-                .orderByAsc("behospital_date")
+                .orderByDesc("behospital_date")
+                .last("limit 1")
         );
         );
 
 
         // 输血效果评价
         // 输血效果评价

+ 12 - 2
src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -121,13 +121,23 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         medicalRecordQe.eq("hospital_id", hisDataDealVO.getHospitalId());
         medicalRecordQe.eq("hospital_id", hisDataDealVO.getHospitalId());
         medicalRecordQe.in("mode_id", hisDataDealVO.getModeId());
         medicalRecordQe.in("mode_id", hisDataDealVO.getModeId());
         medicalRecordQe.in("is_deleted", IsDeleteEnum.N.getKey());
         medicalRecordQe.in("is_deleted", IsDeleteEnum.N.getKey());
+        medicalRecordQe.orderByDesc("rec_date");
         if (hisDataDealVO.getRecIdList().size() > 0) {
         if (hisDataDealVO.getRecIdList().size() > 0) {
             medicalRecordQe.in("rec_id", hisDataDealVO.getRecIdList());
             medicalRecordQe.in("rec_id", hisDataDealVO.getRecIdList());
         }
         }
+
         List<MedicalRecord> medicalRecordList = medicalRecordService.list(medicalRecordQe);
         List<MedicalRecord> medicalRecordList = medicalRecordService.list(medicalRecordQe);
-        
-            medicalRecordList.forEach(medicalRecord -> {
+        ArrayList<Integer> indexList = Lists.newArrayList();
+        for (MedicalRecord medicalRecord : medicalRecordList) {
+            if("1l".equals(medicalRecord.getModeId())){
+                indexList.add(medicalRecordList.indexOf(medicalRecord)) ;
+                if(indexList.size()>1){
+                    medicalRecordList.remove(medicalRecord);
+                }
+            }
+        }
 
 
+            medicalRecordList.forEach(medicalRecord -> {
                         QueryWrapper<MedicalRecordContent> medicalRecordContentQe = new QueryWrapper<>();
                         QueryWrapper<MedicalRecordContent> medicalRecordContentQe = new QueryWrapper<>();
                         medicalRecordContentQe.eq("hospital_id", hisDataDealVO.getHospitalId());
                         medicalRecordContentQe.eq("hospital_id", hisDataDealVO.getHospitalId());
                         medicalRecordContentQe.eq("rec_id", medicalRecord.getRecId());
                         medicalRecordContentQe.eq("rec_id", medicalRecord.getRecId());