厦门

src/main/java/com/diagbot/facade/data/StructuralDataFacade.java

@@ -553,7 +553,7 @@ public class StructuralDataFacade {
                     aBehospitalInfoFacade.execute(behospitalInfo);
                 }
             }else if ("检查信息".equals(modelName)){
-                List<MedPacsResult> pacsResult =fjtzdbConnHarp.getPacsResult(this.sql(s));
+                List<MedPacsResult> pacsResult =fjtzdbConnHarp.getPacsResult(this.sqlOld(s));
                 if (pacsResult.size()>0){
                     aMedPacsResultFacade.execute(pacsResult);
                 }
@@ -580,6 +580,7 @@ public class StructuralDataFacade {
             }else if("入院记录".equals(modelName)){
                 List<FJStrAdmissionNoteVo> medAdmissionNote =fjtzdbConnHarp.getMedAdmissionNote(this.sqlOld(s));
                 if (medAdmissionNote.size()>0){
+
                     aStrAdmissionNoteFacade.getOneList(medAdmissionNote);
                 }
             }else if("危急值记录".equals(modelName)){
@@ -653,22 +654,28 @@ public class StructuralDataFacade {
                 map.put(s.getRecId(),h);
             }
         });
-
         return map;
+    }
 
-//        for (int i = 0; i <hisViewVos.size() ; i++) {
-//            List<HisViewVo> OneList = new ArrayList<>();
-//            for (int j = hisViewVos.size()-1; j >=0 ; j--) {
-//                if (hisViewVos.get(i).getRecId().equals(hisViewVos.get(j).getRecId())){
-//                    OneList.add(hisViewVos.get(j));
-//                    if (hisViewVos.size()==0){
-//                        break;
-//                    }
-//                }
-//            }
-//            map.put(String.valueOf(i),OneList);
-//        }
-//        return map;
+    /**
+     * 住院记录
+     * @param fjStrAdmissionNoteVos
+     * @return
+     */
+    public Map<String,List<FJStrAdmissionNoteVo>> executeOldANote(List<FJStrAdmissionNoteVo> fjStrAdmissionNoteVos){
+        Map<String,List<FJStrAdmissionNoteVo>> map =new HashMap<>();
+        fjStrAdmissionNoteVos.forEach(s->{
+            List<FJStrAdmissionNoteVo> fjStrAdmissionNoteVos1=map.get(s.getRecId());
+            if (fjStrAdmissionNoteVos1!=null){
+                fjStrAdmissionNoteVos1.add(s);
+                map.put(s.getRecId(),fjStrAdmissionNoteVos1);
+            }else {
+                List<FJStrAdmissionNoteVo> h =new ArrayList<>();
+                h.add(s);
+                map.put(s.getRecId(),h);
+            }
+        });
+        return map;
     }
     /**
      * 根据传来的信息编辑视图的sql语句