From 4a5331632b610de141afa1790b9243c9f9b5b02e Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Fri, 15 Jul 2022 14:41:23 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/operate/web/facade/PatientFacade.java    |  4 ++--
 .../com/lyms/platform/operate/web/result/QuanChanResult.java   | 10 +++++-----
 .../platform/operate/web/worker/QuanChanPatientWorker.java     |  4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index e04e4c2..47c66c3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -2294,7 +2294,7 @@ public class PatientFacade extends BaseServiceImpl {
                     data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone()));
                     data.put("cardNo", patientsQueryRequest.getIsEncry() == 0 ? rp.getCardNo() : StringUtils.encryCardNo(rp.getCardNo()));
                     data.put("remark", rp.getRemark());
-                    data.put("dueWeek", rp.getDueWeek());
+                    data.put("dueWeek2", rp.getDueWeek2());
                     data.put("normal", rp.getNormal());
                     datas.add(data);
                 }
@@ -2354,7 +2354,7 @@ public class PatientFacade extends BaseServiceImpl {
                 cnames.put("dueWeek", "分娩日期");
                 cnames.put("createdWeek", "建档孕周");
                 cnames.put("normal", "建档状态");
-                cnames.put("dueWeek", "分娩孕周");
+                cnames.put("dueWeek2", "分娩孕周");
                 cnames.put("cTimes", "总复查次数");
                 cnames.put("tireNumber", "胎数");
                 cnames.put("rLevel", "高危等级");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
index 373cd38..98d7f4a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
@@ -115,14 +115,14 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     //空或者1为正常  2为补录
     private String normal;
     //分娩时间
-    private String dueDate;
+    private String dueWeek2;
 
-    public String getDueDate() {
-        return dueDate;
+    public String getDueWeek2() {
+        return dueWeek2;
     }
 
-    public void setDueDate(String dueDate) {
-        this.dueDate = dueDate;
+    public void setDueWeek2(String dueWeek2) {
+        this.dueWeek2 = dueWeek2;
     }
 
     public String getNormal() {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
index 321dc9d..0f973b7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
@@ -243,7 +243,7 @@ public class QuanChanPatientWorker implements Callable <List <QuanChanResult>> {
                 List <MaternalDeliverModel> maternalDeliverModels = matDeliverService.query(matDeliverQuery);
                 if (CollectionUtils.isNotEmpty(maternalDeliverModels)) {
                     //分娩孕周
-                    chanResult.setDueWeek(maternalDeliverModels.get(0).getDueWeek());
+                    chanResult.setDueWeek2(maternalDeliverModels.get(0).getDueWeek());
                     chanResult.setTireNumber(TaiShuEnums.getTitle(maternalDeliverModels.get(0).getTireNumber() + ""));
                     try {
                         chanResult.setfCh(organizationService.getOrganization(Integer.valueOf(maternalDeliverModels.get(0).getHospitalId())).getName());
@@ -370,8 +370,6 @@ public class QuanChanPatientWorker implements Callable <List <QuanChanResult>> {
 
                 chanResult.sethScore(patients.getRiskScore());
                 chanResult.setNormal(StringUtils.isNotEmpty(patients.getNormal())?"2".equals(patients.getNormal())?"补录":"正常":"正常");
-                //分娩时间
-                chanResult.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
                 data.add(chanResult);
                 logger.debug(stopWatch.toString());
             }
-- 
1.8.3.1