从电子病历取出院诊断和手术

src/main/java/thyyxxk/webserver/service/casefrontsheet/CaseFrontSheetMainService.java

@@ -330,13 +330,16 @@ public class CaseFrontSheetMainService {
         List<CaseFrontsheetDisdiag> disdiags = status == 1 ?
                 dao.selectSignedSheetDiags(bah, times) : dao.getDisdiags(bah, times);
         if (disdiags.isEmpty()) {
-            JSONArray diagList = emrService.getEmrData(bah, times, EmrType.DIAGNOSIS);
-            for (int i = 0; i < diagList.size(); i++) {
-                JSONObject diagItem = diagList.getJSONObject(i);
-                CaseFrontsheetDisdiag diag = dao.selectDiagInfoByCode(diagItem.getString("code"));
-                if (null != diag) {
-                    diag.setNo(disdiags.size() + 1);
-                    disdiags.add(diag);
+            JSONObject emrPatientData = emrService.getEmrPatientData(bah, times);
+            JSONArray diagList = emrPatientData.getJSONArray("出院诊断");
+            if (null != diagList) {
+                for (int i = 0; i < diagList.size(); i++) {
+                    JSONObject diagItem = diagList.getJSONObject(i);
+                    CaseFrontsheetDisdiag diag = dao.selectDiagInfoByCode(diagItem.getString("code"));
+                    if (null != diag) {
+                        diag.setNo(disdiags.size() + 1);
+                        disdiags.add(diag);
+                    }
                 }
             }
         }
@@ -350,7 +353,7 @@ public class CaseFrontSheetMainService {
         List<CaseFrontsheetSurgery> surgeries = status == 1 ?
                 dao.selectSignedSheetSurgeries(bah, times) : dao.getSurgeries(bah, times);
         if (surgeries.isEmpty()) {
-            JSONArray oprtList = emrService.getEmrData(bah, times, EmrType.OPERATION);
+            JSONArray oprtList = emrService.getPatientSurgery(bah, times);
             for (int i = 0; i < oprtList.size(); i++) {
                 JSONObject oprtItem = oprtList.getJSONObject(i);
                 JSONObject oprtName = oprtItem.getJSONObject("手术名称");