新增字典查询

src/main/java/com/ynxbd/common/bean/xk/HisRxDict.java

@@ -5,12 +5,13 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
-// 给要途径字典
+// HIS字典查询
+
 @Setter
 @Getter
 @ToString
 @NoArgsConstructor
-public class HisRxAdmRoute {
+public class HisRxDict {
     // Code 编码
     private String code;
     // Name 名称

src/main/java/com/ynxbd/common/bean/xk/HisRxPharmDict.java

@@ -1,18 +0,0 @@
-package com.ynxbd.common.bean.xk;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-
-// 药房字典
-@Setter
-@Getter
-@ToString
-@NoArgsConstructor
-public class HisRxPharmDict {
-    // Code 编码
-    private String code;
-    // Name 名称
-    private String name;
-}

src/main/java/com/ynxbd/common/bean/xk/MedInsRxCirc.java

@@ -7,18 +7,13 @@ import lombok.ToString;
 
 import java.io.Serializable;
 
-/**
+// 处方流转
- * @author 李进才
- * @ClassName medicalRecipe
- * @Description TODO
- * @date 2023/12/04 09:51:00
- */
 
 @Setter
 @Getter
 @ToString
 @NoArgsConstructor
-public class medicalRecipe implements Serializable {
+public class MedInsRxCirc implements Serializable {
     private String cfNum;
     private Integer flag;
     private String msg;

src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java

@@ -2,7 +2,7 @@ package com.ynxbd.common.dao.his;
 
 import com.ynxbd.common.bean.HisRecipe;
 import com.ynxbd.common.bean.enums.MerchantEnum;
-import com.ynxbd.common.bean.xk.medicalRecipe;
+import com.ynxbd.common.bean.xk.MedInsRxCirc;
 import com.ynxbd.common.his.HisConfig;
 import com.ynxbd.common.his.HisEnum;
 import com.ynxbd.common.his.HisFactory;
@@ -98,7 +98,7 @@ public class HisRecipeDao {
     }
 
     public Result uploadRxMI(String treatNum, String personID, String recipes) {
-        List<medicalRecipe> resultList = new ArrayList<>();
+        List<MedInsRxCirc> resultList = new ArrayList<>();
 
         JsonResult jsonResult = HisFactory.HisMed(MerchantEnum.WX_MEDICAL).getJsonResult(HisEnum.XK_MEDICAL_RECIPE, params -> {
             params.put("PersonID", personID);
@@ -111,9 +111,9 @@ public class HisRecipeDao {
             return Result.error(jsonResult.getMessage());
         }
 
-        List<medicalRecipe> medicalRecipe = jsonResult.getDataMapList(medicalRecipe.class, "CFNums", "Item");
+        List<MedInsRxCirc> dataList = jsonResult.getDataMapList(MedInsRxCirc.class, "CFNums", "Item");
-        if (medicalRecipe != null) {
+        if (dataList != null) {
-            resultList = medicalRecipe;
+            resultList = dataList;
         }
         return Result.success(resultList);
     }

src/main/java/com/ynxbd/common/dao/his/HisXKDao.java

@@ -1,7 +1,5 @@
 package com.ynxbd.common.dao.his;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.ynxbd.common.bean.xk.*;
 import com.ynxbd.common.helper.common.JsonHelper;
 import com.ynxbd.common.his.HisEnum;
@@ -24,14 +22,23 @@ public class HisXKDao {
             return jsonResult.getDataMapList(HisRxUseCount.class, "Items", "Item");
         }
         if ("2".equals(type)) { // 给要途径字典
-            return jsonResult.getDataMapList(HisRxAdmRoute.class, "Items", "Item");
+            return jsonResult.getDataMapList(HisRxDict.class, "Items", "Item");
         }
         if ("3".equals(type)) { // 药房字典
-            return jsonResult.getDataMapList(HisRxPharmDict.class, "Items", "Item");
+            return jsonResult.getDataMapList(HisRxDict.class, "Items", "Item");
         }
         if ("4".equals(type)) { // 药品
             return jsonResult.getDataMapList(HisRxDrug.class, "Items", "Item");
         }
+        if ("5".equals(type)) { // 中医疾病诊断
+            return jsonResult.getDataMapList(HisRxDict.class, "Items", "Item");
+        }
+        if ("6".equals(type)) { // 中医证候诊断
+            return jsonResult.getDataMapList(HisRxDict.class, "Items", "Item");
+        }
+        if ("7".equals(type)) { // 西医诊断疾病
+            return jsonResult.getDataMapList(HisRxDict.class, "Items", "Item");
+        }
         return new ArrayList<>();
     }
 

src/main/java/com/ynxbd/common/dao/xk/XKRxDao.java

@@ -0,0 +1,6 @@
+package com.ynxbd.common.dao.xk;
+
+
+public class XKRxDao {
+
+}