添加医疗类别

src/main/java/thyyxxk/webserver/entity/medicalinsurance/query/BaseSetlStatistics.java

@@ -14,6 +14,11 @@ public class BaseSetlStatistics {
     private String insutype;
     private String insutypeName;
     private String psnName;
+    /**
+     * 医疗类别
+     */
+    private String medType;
+    private String medTypeName;
     /**
      * 基本医疗保险统筹基金支出
      */

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiQueryService.java

@@ -2,12 +2,10 @@ package thyyxxk.webserver.service.medicalinsurance;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
-import thyyxxk.webserver.constants.sidicts.SiFunction;
 import thyyxxk.webserver.constants.YesOrNo;
 import thyyxxk.webserver.constants.sidicts.*;
 import thyyxxk.webserver.dao.his.medicalinsurance.SiQueryDao;
@@ -20,7 +18,10 @@ import thyyxxk.webserver.entity.medicalinsurance.query.*;
 import thyyxxk.webserver.entity.medicalinsurance.setlinfo.SiSetldetail;
 import thyyxxk.webserver.entity.medicalinsurance.setlinfo.SiSetlinfo;
 import thyyxxk.webserver.entity.medicalinsurance.setlinfo.TimesList;
-import thyyxxk.webserver.entity.medicalinsurance.setllist.*;
+import thyyxxk.webserver.entity.medicalinsurance.setllist.BrfChrgitm;
+import thyyxxk.webserver.entity.medicalinsurance.setllist.CuminfoInYear;
+import thyyxxk.webserver.entity.medicalinsurance.setllist.InptntSetlmtLst;
+import thyyxxk.webserver.entity.medicalinsurance.setllist.OtptntSetlmtLst;
 import thyyxxk.webserver.entity.yibao.ZyActpatient;
 import thyyxxk.webserver.service.redislike.RedisLikeService;
 import thyyxxk.webserver.service.wxapi.SendWxInfoService;
@@ -38,14 +39,14 @@ import java.util.*;
 @Slf4j
 @Service
 public class SiQueryService {
+    private static final String RESULT_CODE = "infcode";
+    private static final String ERROR_MESSAGE = "err_msg";
+    private static final String OUTPUT = "output";
     private final ExecService exec;
     private final SiQueryDao dao;
     private final SendWxInfoService wxsrvc;
     private final SiSetlinfoDao setlinfoDao;
     private final RedisLikeService redis;
-    private static final String RESULT_CODE = "infcode";
-    private static final String ERROR_MESSAGE = "err_msg";
-    private static final String OUTPUT = "output";
 
     @Autowired
     public SiQueryService(ExecService exec, SiQueryDao dao, SendWxInfoService wxsrvc, SiSetlinfoDao setlinfoDao, RedisLikeService redis) {
@@ -1486,6 +1487,7 @@ public class SiQueryService {
                 tempList.add(itm);
                 admdvsSetldataMap.put(admdvsName, tempList);
             }
+            itm.setMedTypeName(MedType.getName(itm.getMedType()));
             shangChuanJieSuanDan.add(itm);
         });