drg 提取数据

src/main/java/thyyxxk/webserver/constants/EmrType.java

@@ -2,12 +2,12 @@ package thyyxxk.webserver.constants;
 
 public enum EmrType {
     /**
-     * 诊断
+     * 诊断,获取入院记录中的入院诊断
      */
-    DIAGNOSIS(0, "shoucibingchengjilu"),
+    DIAGNOSIS(0, "ruyuanjiluzhuanyong"),
 
     /**
-     * 手术
+     * 手术，获取手术记录中的数据
      */
     OPERATION(1, "a2a2866054fe11edb28ac955a5f5cad1");
 

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/EmrServer.java

@@ -204,13 +204,18 @@ public class EmrServer {
             // 获取 需要提取的数据元
             List<String> strings = JSON.parseArray(emrDataExtract.getDataExtract(), String.class);
             log.info("需要提取的数据：{}", strings);
+            // 获取到已经提取的数据
             EmrDataElement emrDataElement = dao.obtainPatientSOriginalData(patientData.getPatNo(), patientData.getTimes());
+            // 转 json
             JSONObject jsonObject = JSONObject.parseObject(emrDataElement.getDataElement());
             for (String string : strings) {
+                // 删除提取到的数据
                 jsonObject.remove(string);
             }
+            // 更新患者数据元
             dao.updatePatientDataSource(patientData.getPatNo(), patientData.getTimes(), JSON.toJSONString(jsonObject));
         }
+        // 删除病历
         dao.deletePatientEmrByDocumentId(documentId, TokenUtil.getTokenUserId());
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "删除成功.");
     }
@@ -226,6 +231,13 @@ public class EmrServer {
     }
 
 
+    /**
+     * 医生诊断热缩
+     *
+     * @param userCode  医生编码
+     * @param code      诊断 code
+     * @param tableName 表名
+     */
     public void hotSearchSorting(String userCode, String code, String tableName) {
         boolean insert = dao.queryWhetherThereIsHotSearch(userCode, code, tableName) == 0;
         if (insert) {
@@ -285,8 +297,6 @@ public class EmrServer {
                 returnArray.add(item.getValue());
             }
         }
-
-
         return returnArray;
     }
 
@@ -322,18 +332,14 @@ public class EmrServer {
                 mapData.put("jbdm" + i, item.getString("code"));
             }
         }
-        Map<String, JSONObject> surgicalSequencing = new TreeMap<>();
+
+        int operationIndex = 1;
+
         for (int i = 0; i < operation.size(); i++) {
             JSONObject item = operation.getJSONObject(i);
-            String key = DateUtil.formatDatetime(item.getJSONObject("手术日期").getDate("value"));
-            surgicalSequencing.put(key, item);
-        }
-        int operationIndex = 1;
-        for (Map.Entry<String, JSONObject> o : surgicalSequencing.entrySet()) {
-            JSONObject item = o.getValue();
             JSONArray list = item.getJSONObject("手术名称").getJSONArray("value");
-            for (int i = 0; i < list.size(); i++) {
-                JSONObject valueList = list.getJSONObject(i);
+            for (int a = 0; a < list.size(); a++) {
+                JSONObject valueList = list.getJSONObject(a);
                 mapData.put("ssjczbm" + operationIndex, valueList.getString("code"));
                 if (operationIndex == 1) {
                     mapData.put("ssjczmc" + operationIndex, valueList.getString("name"));
@@ -342,15 +348,15 @@ public class EmrServer {
             }
         }
 
+
         AuxiliaryFillingOfDiagnosis data = EntityCopy.Copy(mapData, AuxiliaryFillingOfDiagnosis.class);
 
         String url = "http://172.16.32.126:8080/drg_web/localHelp/drg_dagns/list.action";
         RestTemplate template = new RestTemplate();
-        String res = template.postForObject(url, JSON.parseObject(JSON.toJSONString(data, SerializerFeature.WriteNullStringAsEmpty)), String.class);
-        log.info("返回数据：{}", res);
-        log.info("数据：{}", JSON.toJSONString(data));
-
-        return ResultVoUtil.success();
+        String toJsonStr = JSON.toJSONString(data, SerializerFeature.WriteNullStringAsEmpty);
+        log.info("DRG数据：{}", toJsonStr);
+        String res = template.postForObject(url, JSON.parseObject(toJsonStr), String.class);
+        return ResultVoUtil.success("http://172.16.32.126:8080" + res);
     }