优化代码和检验接口

src/main/java/thyyxxk/webserver/service/inpatient/PatientService.java

@@ -245,7 +245,6 @@ public class PatientService {
                 // 根据身份证计算出生年龄
                 data.setBirthDate(getBirthdayFromSocialNo(data.getSocialNo()));
             } catch (Exception e) {
-                e.printStackTrace();
                 log.error("设置出生日期出错");
             }
         }
@@ -254,7 +253,6 @@ public class PatientService {
             // 年龄
             data.setAge(DateUtil.calculateAge(new SimpleDateFormat("yyyy-MM-dd").parse(data.getBirthDate()), data.getAdmissDate()));
         } catch (Exception e) {
-            e.printStackTrace();
             log.error("计算年龄出错");
         }
 

src/main/java/thyyxxk/webserver/service/jianyanjiekou/JianYanJieKouService.java

@@ -1,6 +1,5 @@
 package thyyxxk.webserver.service.jianyanjiekou;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dtflys.forest.Forest;
@@ -14,7 +13,6 @@ import thyyxxk.webserver.entity.jianyanjiekou.QueryNormal;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.StringUtil;
 
-
 @Service
 @Slf4j
 public class JianYanJieKouService {
@@ -59,10 +57,8 @@ public class JianYanJieKouService {
         js.put("startDate", param.getStartDate());
         js.put("endDate", param.getEndDate());
 
-
         Res res = postHttp("/third/report/query/normal", js);
         if (res.getCode()) {
-            log.info("检验接口获取的数据：{}", JSON.parse(res.getData()));
             JSONObject data = JSONObject.parseObject(res.getData());
             return ResultVoUtil.success(data.getJSONArray("items"));
         }

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

@@ -169,6 +169,15 @@ public class JianYanJianChaShenQingService {
     }
 
     public ResultVo<List<JcZdClass>> getTemplateGrouping(Integer itemType, Integer templateType) {
+        QueryWrapper<?> qw = templateQueryWrapper(itemType, templateType);
+        return ResultVoUtil.success(dao.getTemplate(qw));
+    }
+
+    public ResultVo<List<Map<String, String>>> getTemplateByCodeAndType(String code, String type) {
+        return ResultVoUtil.success(dao.getTemplateByCodeAndType(code, type));
+    }
+
+    private QueryWrapper<?> templateQueryWrapper(Integer itemType, Integer templateType) {
         QueryWrapper<?> qw = new QueryWrapper<>();
         qw.eq("c.req_type", itemType);
         if (templateType == 2) {
@@ -177,11 +186,7 @@ public class JianYanJianChaShenQingService {
             UserInfo info = realtimeService.getUserInfoByToken();
             qw.eq("c.tc_exec", info.getDeptCode());
         }
-        return ResultVoUtil.success(dao.getTemplate(qw));
-    }
-
-    public ResultVo<List<Map<String, String>>> getTemplateByCodeAndType(String code, String type) {
-        return ResultVoUtil.success(dao.getTemplateByCodeAndType(code, type));
+        return qw;
     }
 
 
@@ -191,14 +196,7 @@ public class JianYanJianChaShenQingService {
      * @return
      */
     public ResultVo<List<JcZdClass>> getTemplate(Integer itemType, Integer templateType) {
-        QueryWrapper<?> qw = new QueryWrapper<>();
-        qw.eq("c.req_type", itemType);
-        if (templateType == 2) {
-            qw.eq("c.op_id", TokenUtil.getInstance().getTokenUserId());
-        } else {
-            UserInfo info = realtimeService.getUserInfoByToken();
-            qw.eq("c.tc_exec", info.getDeptCode());
-        }
+        QueryWrapper<?> qw = templateQueryWrapper(itemType, templateType);
         List<JcZdClass> parentNode = dao.getTemplate(qw);
         Map<String, JcZdClass> map = parentNode
                 .stream()
@@ -369,7 +367,7 @@ public class JianYanJianChaShenQingService {
      * @return 返回有没有
      */
     public ResultVo<Boolean> jianChaJianYanMuBanMing(String name, String reqType) {
-        return ResultVoUtil.success(dao.huoQuJianChaJianYanChongFuMuBanMing(name, TokenUtil.getInstance().getTokenUserId(), reqType).size() > 0);
+        return ResultVoUtil.success(!dao.huoQuJianChaJianYanChongFuMuBanMing(name, TokenUtil.getInstance().getTokenUserId(), reqType).isEmpty());
     }
 
     /**