From 7fb0c6796494323c76065d1964c4f45b10beb42d Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 2 Sep 2022 11:16:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=91=E7=94=9F=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/LivelihoodProjectsController.java      |  5 +++--
 .../operate/web/facade/LivelihoodProjectsFacade.java      | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LivelihoodProjectsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LivelihoodProjectsController.java
index 9f575c0..7535bbc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LivelihoodProjectsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LivelihoodProjectsController.java
@@ -85,8 +85,9 @@ public class LivelihoodProjectsController extends BaseController {
     @RequestMapping(value = "/getMsgcC201", method = RequestMethod.GET)
     @ResponseBody
     public BaseObjectResponse getMsgcC201(@RequestParam(required = false) String startDate,
-                                          @RequestParam(required = false) String endDate) {
-        return livelihoodProjectsFacade.getMsgcC201(startDate,endDate);
+                                          @RequestParam(required = false) String endDate,
+                                          @RequestParam(required = false) String cardNo) {
+        return livelihoodProjectsFacade.getMsgcC201(startDate,endDate,cardNo);
     }
     /**
      * 孕分娩记录（主）C301
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java
index a856975..5531f0a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java
@@ -769,21 +769,26 @@ public class LivelihoodProjectsFacade {
         return objectResponse;
     }
 
-    public BaseObjectResponse getMsgcC201(String startDate, String endDate) {
+    public BaseObjectResponse getMsgcC201(String startDate, String endDate,String cardNo) {
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setYn(YnEnums.YES.getId());
         patientsQuery.setTypeList(Arrays.asList(1,3));//孕妇，产妇
         patientsQuery.setExtEnable(false);
         patientsQuery.setBuildTypeNot(1);
+        if (StringUtils.isNotEmpty(cardNo))
+        {
+            patientsQuery.setCardNo(cardNo);
+        }
 
         if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) {
             patientsQuery.setBookbuildingDateStart(DateUtil.getDayFirstSecond(DateUtil.parseYMD(startDate)));
             patientsQuery.setBookbuildingDateEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD(endDate)));
-        }else {
-            //默认获取当天数据
-            patientsQuery.setBookbuildingDateStart(DateUtil.getDayFirstSecond(new Date()));
-            patientsQuery.setBookbuildingDateEnd(DateUtil.getDayLastSecond(new Date()));
         }
+//        else {
+//            //默认获取当天数据
+//            patientsQuery.setBookbuildingDateStart(DateUtil.getDayFirstSecond(new Date()));
+//            patientsQuery.setBookbuildingDateEnd(DateUtil.getDayLastSecond(new Date()));
+//        }
         List <Patients> patientsList = patientsService.queryPatient(patientsQuery);
         List<Map> data = new ArrayList<>();
         for (Patients patients : patientsList) {
-- 
1.8.3.1