From 284545b6694878772a77ed329283b4901a4534f0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 28 四月 2025 18:00:41 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/IPatMedInhospService.java                    |   10 +
 smartor/src/main/java/com/smartor/domain/PatServiceCount.java                          |   53 ++++++++
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java            |   13 ++
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java                           |   65 ++++++++--
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java       |    1 
 ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java                       |   74 ++++++++++++
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java |   12 ++
 ruoyi-admin/src/main/resources/application-druid.yml                                   |   22 +--
 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java                 |   71 +++++++++--
 ruoyi-admin/src/main/resources/application.yml                                         |    2 
 10 files changed, 273 insertions(+), 50 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index c721b18..88ce994 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -6,6 +6,7 @@
 import com.google.gson.Gson;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.enums.ServiceFromEnum;
+import com.ruoyi.common.enums.WxGZHEnum;
 import com.ruoyi.common.utils.HttpUtil;
 import com.ruoyi.common.utils.RSAPublicKeyExample;
 import com.ruoyi.common.utils.StringUtils;
@@ -30,12 +31,15 @@
 import org.springframework.stereotype.Component;
 
 import java.net.URLEncoder;
+import java.security.MessageDigest;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+
+import static cn.hutool.core.convert.Convert.toHex;
 
 @Slf4j
 @Component//鐩戝惉姝ら槦鍒�
@@ -53,9 +57,6 @@
     @Value("${req_path}")
     private String req_path;
 
-    @Value("${thirdWXUrl}")
-    private String thirdWXUrl;
-
     @Autowired
     private IServiceOutPathService iServiceOutPathService;
 
@@ -72,16 +73,10 @@
     private RedisCache redisCache;
 
     @Autowired
-    private RobotPhoneUtils robotPhoneUtils;
-
-    @Autowired
     private ServiceTaskMapper svyTaskMapper;
 
     @Autowired
     private ServiceSubtaskMapper serviceSubtaskMapper;
-
-    @Autowired
-    private ISvyTaskTemplateService iSvyTaskTemplateService;
 
     @Autowired
     private IServiceSubtaskRecordService serviceSubtaskRecordService;
@@ -91,9 +86,6 @@
 
     @Value("${xhsmsPath}")
     private String xhsmsPath;
-
-    @Value("${appid}")
-    private String appid;
 
     // 鍒涘缓鍥哄畾澶у皬鐨勭嚎绋嬫睜
     private static final ExecutorService executorService = Executors.newFixedThreadPool(10);
@@ -489,7 +481,32 @@
                                 url = ip + ":" + req_path + "/xj?p=" + format;
                             }
                             PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(serviceSubtask.getPatid());
-                            String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), patArchive.getName(), patArchive.getPatientno());
+                            if (StringUtils.isEmpty(patArchive.getPatidHis())) {
+                                ServiceSubtask ss = new ServiceSubtask();
+                                ss.setResult("error");
+                                ss.setRemark("鍏紬鍙峰彂閫佸け璐�,his绯荤粺鐨勬偅鑰卛d涓虹┖");
+                                ss.setSendstate(5L);
+                                ss.setId(serviceSubtask.getId());
+                                ss.setFinishtime(new Date());
+                                serviceSubtaskMapper.updateServiceSubtask(ss);
+                                continue;
+                            }
+
+                            //鑾峰彇寰俊鍏紬鍙疯姹備俊鎭牴鎹満鏋処D
+                            List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid());
+                            if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
+                                ServiceSubtask ss = new ServiceSubtask();
+                                ss.setResult("error");
+                                ss.setRemark("璇ユ満鏋勭殑鍏紬鍙烽厤缃俊鎭笉鍏紝鏃犳硶閫氳繃鍏紬鍙峰彂閫�");
+                                ss.setSendstate(5L);
+                                ss.setId(serviceSubtask.getId());
+                                ss.setFinishtime(new Date());
+                                serviceSubtaskMapper.updateServiceSubtask(ss);
+                                continue;
+                            }
+
+
+                            String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), patArchive.getName(), patArchive.getPatidHis(),wxqqxx);
                             Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
                             if (!map.isEmpty()) {
                                 serviceSubtask.setResult("success");
@@ -633,22 +650,42 @@
         return key;
     }
 
-    private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String setPatientname, String setPatientid) {
+    private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String patientname, String setPatientid,List<String> wxqqxx) {
         XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
         xinHuaWXReq.setIdcard(idcard);
         xinHuaWXReq.setUrl(url);
         xinHuaWXReq.setPatientid(setPatientid);
-        xinHuaWXReq.setPatientname(setPatientname);
+        xinHuaWXReq.setPatientname(patientname);
         xinHuaWXReq.setMobile(phone);
         xinHuaWXReq.setMedcardno(null);
         xinHuaWXReq.setTitlename(taskName);
         xinHuaWXReq.setContent(taskDesc);
-        xinHuaWXReq.setAppid(appid);
+        xinHuaWXReq.setAppid(wxqqxx.get(1));
         log.error("-----寰俊鍏紬鍙风殑鍑哄樊涓�----锛歿}", xinHuaWXReq);
-        String result = HttpUtils.sendPost(thirdWXUrl, new Gson().toJson(xinHuaWXReq));
+        String body = new Gson().toJson(xinHuaWXReq);
+        String encode = encode(wxqqxx.get(2).concat(body));
+        log.error("--------encode鐨勫�间负锛歿}-----", encode);
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("sign", encode);
+        String result = HttpUtils.sendPostByHeader(wxqqxx.get(3), body, headerMap);
+        log.error("--------result鐨勫�间负锛歿}-----", result);
+
         JSONObject jsonObject = JSONObject.parseObject(result);
         String code = (String) jsonObject.toString();
         return code;
     }
 
+    public String encode(String arg) {
+        if (arg == null) {
+            arg = "";
+        }
+        MessageDigest md5 = null;
+        try {
+            md5 = MessageDigest.getInstance("MD5");
+            md5.update(arg.getBytes("UTF-8"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return toHex(md5.digest());
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
index 997d368..8a8ff8c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
@@ -12,6 +12,7 @@
 import com.smartor.domain.PatMedInhosp;
 import com.smartor.domain.PatMedInhospVO;
 import com.smartor.domain.PatMedReq;
+import com.smartor.domain.PatServiceCount;
 import com.smartor.service.IPatMedInhospService;
 import com.smartor.service.IPatMedOuthospService;
 import io.swagger.annotations.Api;
@@ -63,6 +64,17 @@
     }
 
     /**
+     * 鍑洪櫌銆侀棬璇婁汉鏁板拰闅忚閲忕粺璁★紙鍛紝鏈堬紝骞达級
+     */
+    @ApiOperation("鍑洪櫌銆侀棬璇婁汉鏁板拰闅忚閲忕粺璁★紙鍛紝鏈堬紝骞达級")
+    //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')")
+    @PostMapping("/queryPersonCount")
+    public TableDataInfo queryPersonCount(@RequestBody PatServiceCount patServiceCount) {
+
+        return null;
+    }
+
+    /**
      * 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
      */
     @ApiOperation("鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�")
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index cf03329..980a88d 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -13,10 +13,10 @@
         #        鍏徃
         #        url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         #        涓芥按
-        url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: smartor
-        password: Smartor.2023
-        driverClassName: com.mysql.cj.jdbc.Driver
+        #        url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        #        username: smartor
+        #        password: Smartor.2023
+        #        driverClassName: com.mysql.cj.jdbc.Driver
         #        # 鏂板崕
         #        url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         #        username: smartor
@@ -24,10 +24,10 @@
         #        driverClassName: com.mysql.cj.jdbc.Driver
 
         #  鍏徃浜�
-#        url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#        username: hxsoft
-#        password: Hxerp2000
-#        driverClassName: com.mysql.cj.jdbc.Driver
+        url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: hxsoft
+        password: Hxerp2000
+        driverClassName: com.mysql.cj.jdbc.Driver
 
       # 浠庡簱鏁版嵁婧�
       slave:
@@ -100,12 +100,6 @@
     page: page
     default-page: 1
     default-size: 10
-
-  #寰俊鍏紬鍙风殑瀵嗛挜锛堜附姘达級
-appid: "3311000002"
-appSecret: MzMxMTAwMDAwMg==
-#绗笁鏂瑰井淇″叕浼楀彿鍙戦�佸湴鍧�锛堜附姘达級
-thirdWXUrl: http://192.168.10.170:18001/frontend/medical/api
 
 #閽夐拤鐨勫瘑閽�
 dingAppid: dingn8iip5ubj7clrrsv
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 1d111a2..92baec4 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -131,7 +131,7 @@
 # Swagger閰嶇疆
 swagger:
   # 鏄惁寮�鍚痵wagger
-  enabled: false
+  enabled: true
   # 璇锋眰鍓嶇紑
   pathMapping: /dev-api
 
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java
new file mode 100644
index 0000000..24dca07
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java
@@ -0,0 +1,74 @@
+package com.ruoyi.common.enums;
+
+import com.ruoyi.common.utils.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 涓芥按鍏紬鍙�
+ */
+public enum WxGZHEnum {
+    ZYY("47231022633110211A2101", "3311000002", "MzMxMTAwMDAwMg==", "http://192.168.10.170:18001/frontend/medical/api"), JN("47255004333112711A1001", null, null, null);
+
+
+    private String orgid;
+    private String appid;
+    private String appSecret;
+    private String address;
+
+    WxGZHEnum(String orgid, String appid, String appSecret, String address) {
+        this.orgid = orgid;
+        this.appid = appid;
+        this.appSecret = appSecret;
+        this.address = address;
+    }
+
+    public static List<String> getDescByCode(String orgid) {
+        WxGZHEnum[] organEnums = values();
+        for (int i = 0; i < organEnums.length; i++) {
+            WxGZHEnum organEnum = organEnums[i];
+            if (organEnum.getOrgid().equals(orgid)) {
+                List<String> list = new ArrayList<>();
+                if (StringUtils.isEmpty(organEnum.getOrgid())) list.add(organEnum.getOrgid());
+                if (StringUtils.isEmpty(organEnum.getAppid())) list.add(organEnum.getAppid());
+                if (StringUtils.isEmpty(organEnum.getAppSecret())) list.add(organEnum.getAppSecret());
+                if (StringUtils.isEmpty(organEnum.getAddress())) list.add(organEnum.getAddress());
+                return list;
+            }
+        }
+        return null;
+    }
+
+    public String getOrgid() {
+        return orgid;
+    }
+
+    public void setOrgid(String orgid) {
+        this.orgid = orgid;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAppid() {
+        return appid;
+    }
+
+    public void setAppid(String appid) {
+        this.appid = appid;
+    }
+
+    public String getAppSecret() {
+        return appSecret;
+    }
+
+    public void setAppSecret(String appSecret) {
+        this.appSecret = appSecret;
+    }
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index cb645e8..9be2bab 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -11,6 +11,7 @@
 import com.google.gson.JsonObject;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.enums.ServiceFromEnum;
+import com.ruoyi.common.enums.WxGZHEnum;
 import com.ruoyi.common.utils.DtoConversionUtils;
 import com.ruoyi.common.utils.HttpUtil;
 import com.ruoyi.common.utils.RSAPublicKeyExample;
@@ -41,6 +42,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.security.MessageDigest;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -50,6 +52,8 @@
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
+
+import static cn.hutool.core.convert.Convert.toHex;
 
 /**
  * 瀹氭椂浠诲姟璋冨害娴嬭瘯
@@ -97,9 +101,6 @@
 
     @Value("${pub_key}")
     private String pub_key;
-
-    @Value("${thirdWXUrl}")
-    private String thirdWXUrl;
 
     @Value("${req_path}")
     private String req_path;
@@ -542,10 +543,32 @@
                                 url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "&param2=" + patid + "&param3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=false";
 //                                String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), "鏃�");
 
-                                String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatientno());
+                                //鑾峰彇寰俊鍏紬鍙疯姹備俊鎭牴鎹満鏋処D
+                                List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid());
+                                if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
+                                    ServiceSubtask ss = new ServiceSubtask();
+                                    ss.setResult("error");
+                                    ss.setRemark("璇ユ満鏋勭殑鍏紬鍙烽厤缃俊鎭笉鍏紝鏃犳硶閫氳繃鍏紬鍙峰彂閫�");
+                                    ss.setSendstate(5L);
+                                    ss.setId(serviceSubtask.getId());
+                                    ss.setFinishtime(new Date());
+                                    serviceSubtaskMapper.updateServiceSubtask(ss);
+                                    continue;
+                                }
+
+                                if (StringUtils.isEmpty(patArchive.getPatidHis())) {
+                                    ServiceSubtask ss = new ServiceSubtask();
+                                    ss.setResult("error");
+                                    ss.setRemark("鍏紬鍙峰彂閫佸け璐�,his绯荤粺鐨勬偅鑰卛d涓虹┖");
+                                    ss.setSendstate(5L);
+                                    ss.setId(serviceSubtask.getId());
+                                    ss.setFinishtime(new Date());
+                                    serviceSubtaskMapper.updateServiceSubtask(ss);
+                                    continue;
+                                }
+                                String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
 
                                 Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
-
                                 //浠诲姟鍙戦�佽褰�
                                 ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
                                 serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
@@ -799,7 +822,7 @@
         return key;
     }
 
-    private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String setPatientname, String setPatientid) {
+    private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String setPatientname, String setPatientid, List<String> wxqqxx) {
         XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
         xinHuaWXReq.setIdcard(idcard);
         xinHuaWXReq.setUrl(url);
@@ -809,17 +832,31 @@
         xinHuaWXReq.setMedcardno(null);
         xinHuaWXReq.setTitlename(taskName);
         xinHuaWXReq.setContent(taskDesc);
-        xinHuaWXReq.setAppid(appid);
+        xinHuaWXReq.setAppid(wxqqxx.get(1));
         log.error("----getWXCode---xinHuaWXReq鐨勫嚭鍙備负锛歿}", xinHuaWXReq);
-        String result = HttpUtils.sendPost(thirdWXUrl, new Gson().toJson(xinHuaWXReq));
+        String body = new Gson().toJson(xinHuaWXReq);
+        String encode = encode(wxqqxx.get(2).concat(body));
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("sign", encode);
+        String result = HttpUtils.sendPostByHeader(wxqqxx.get(3), body, headerMap);
+
         JSONObject jsonObject = JSONObject.parseObject(result);
         String code = (String) jsonObject.toString();
         return code;
     }
-//    public static void main(String[] args) {
-//        LocalDateTime originalDateTime = LocalDateTime.now();
-//        LocalDateTime startOfDay = originalDateTime.with(LocalTime.MIN);
-//        System.out.println("Original DateTime: " + originalDateTime);
-//        System.out.println("Start of Day: " + startOfDay);
-//    }
+
+
+    public String encode(String arg) {
+        if (arg == null) {
+            arg = "";
+        }
+        MessageDigest md5 = null;
+        try {
+            md5 = MessageDigest.getInstance("MD5");
+            md5.update(arg.getBytes("UTF-8"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return toHex(md5.digest());
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 5fa94be..ebf45c3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -492,6 +492,7 @@
                 sysUserDept.setUserId(user.getUserId());
                 sysUserDept.setDeptCode(wardCode);
                 sysUserDept.setDeptId(sysDept.getDeptId());
+                sysUserDept.setOrgid(user.getOrgid());
                 List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
                 sysUserDept.setDelFlag(0L);
                 sysUserDept.setDeptType("2");
diff --git a/smartor/src/main/java/com/smartor/domain/PatServiceCount.java b/smartor/src/main/java/com/smartor/domain/PatServiceCount.java
new file mode 100644
index 0000000..daf4b0a
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatServiceCount.java
@@ -0,0 +1,53 @@
+package com.smartor.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍑洪櫌銆侀棬璇婁汉鏁板拰闅忚閲忕粺璁★紙鍛紝鏈堬紝骞达級 PatServiceCount
+ *
+ * @author smartor
+ * @date 2023-03-04
+ */
+@ApiModel(value = "PatServiceCount", description = "鍑洪櫌銆侀棬璇婁汉鏁板拰闅忚閲忕粺璁★紙鍛紝鏈堬紝骞达級")
+@Data
+public class PatServiceCount extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 鑷ID
+     */
+    @ApiModelProperty(value = "鍑洪櫌杩樻槸闂ㄨ瘖锛�1锛氬嚭闄�  2闂ㄨ瘖锛�")
+    private Integer cymz;
+
+    /**
+     * 闂撮殧锛� 1鍛�  2鏈�  3骞�
+     */
+    @ApiModelProperty(value = "闂撮殧锛� 1鍛�  2鏈�  3骞�")
+    private Integer interval;
+
+
+    /**
+     * 寮�濮嬫椂闂�
+     */
+    @ApiModelProperty(value = "寮�濮嬫椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 鍏ラ櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date starttime;
+
+    /**
+     * 鍑洪櫌鏃堕棿
+     */
+    @ApiModelProperty(value = "缁撴潫鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 鍑洪櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endtime;
+
+}
diff --git a/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java b/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
index 1d7149c..486b098 100644
--- a/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
@@ -2,10 +2,7 @@
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.smartor.domain.PatMedInhosp;
-import com.smartor.domain.PatMedInhospVO;
-import com.smartor.domain.PatMedReq;
-import com.smartor.domain.PatMedRes;
+import com.smartor.domain.*;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -35,6 +32,11 @@
     public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp);
 
     /**
+     * 鍑洪櫌銆侀棬璇婁汉鏁板拰闅忚閲忕粺璁★紙鍛紝鏈堬紝骞达級
+     */
+    public Map<String,Integer> queryPersonCount(PatServiceCount patServiceCount);
+
+    /**
      * 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
      *
      * @param patMedInhospVO
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index 1f2294e..7f8a924 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -76,6 +76,19 @@
         return patMedInhospList;
     }
 
+    @Override
+    public Map<String, Integer> queryPersonCount(PatServiceCount patServiceCount) {
+        if (patServiceCount.getInterval() == 1) {
+            //鍛�
+        } else if (patServiceCount.getInterval() == 2) {
+            //鏈�
+        } else if (patServiceCount.getInterval() == 3) {
+            //骞�
+        }
+
+        return null;
+    }
+
     /**
      * 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
      *

--
Gitblit v1.9.3