From 831eec37abc3dc1e21e0f95d7e92efd7371453e5 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 20 Sep 2022 09:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=82=8C=E8=90=8E=E7=BC=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/pojo/CancerExamineModel.java |  9 +++++-
 .../com/lyms/hospitalapi/lhxfy/LhxfyService.java   | 32 ++++++++++++++--------
 .../web/controller/BabyBuildController.java        |  2 +-
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineModel.java
index 61180a5..62e49bd 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineModel.java
@@ -15,9 +15,16 @@ public class CancerExamineModel  extends BaseModel {
 
     private Integer year; //上报年份
     private Integer quarter; //季度
-    private String optUser; //录入用户
+
+    private Integer yearQuarter;
+
+    private String inHospital;//填报单位
+    private String inUser;//填报人
+    private Date inDate;//填报日期
     private String optHospital; //录入单位
+    private String optUser; //录入用户
     private Date optDate; //录入时间
+
     private Integer type;//1 宫颈癌 2 乳腺癌
 
     private Date  examineDate;//审核时间/驳回时间
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
index 4040404..9f1a2e2 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
@@ -721,6 +721,12 @@ public class LhxfyService {
         if (CollectionUtils.isNotEmpty(premaritalCheckupList))
         {
             for (PremaritalCheckup premaritalCheckup : premaritalCheckupList) {
+
+                if (StringUtils.isEmpty(premaritalCheckup.getCertificateNum()))
+                {
+                    continue;
+                }
+
                // premaritalCheckup.setLhHiv("2");
                 //获取lis检查数据
                 List<LisReportModel> lisReportModels = getLhxfyLis(premaritalCheckup.getCertificateNum());
@@ -779,17 +785,17 @@ public class LhxfyService {
                                     case "001D-BIL":
                                         premaritalCheckup.setDbil(result);
                                         break;
-                                    /***尿常规检查***/
-                                    case "GLU02":
-                                        if(result.equals("- 0"))
-                                        {
-                                            premaritalCheckup.setGlu("阴性");
-                                        }
-                                        else
-                                        {
-                                            premaritalCheckup.setGlu("阳性");
-                                        }
-                                        break;
+//                                    /***尿常规检查***/
+//                                    case "GLU02":
+//                                        if(result.equals("- 0"))
+//                                        {
+//                                            premaritalCheckup.setGlu("阴性");
+//                                        }
+//                                        else
+//                                        {
+//                                            premaritalCheckup.setGlu("阳性");
+//                                        }
+//                                        break;
                                     /***血型***/
                                     case "RH":
                                         if(result.contains("阳性")) {
@@ -921,11 +927,13 @@ public class LhxfyService {
                 premaritalCheckup.setLhHiv("2");
                 /***乙肝表面抗原***/
                 premaritalCheckup.setHbsag("2");
-
+                //尿常规
+                premaritalCheckup.setGlu("阴性");
                 //检查结果更新到个人档案
                 Query query2 = Query.query(Criteria.where("id").is(premaritalCheckup.getId()));
                 Update update2 = MongoConvertHelper
                         .convertToNativeUpdate(ReflectionUtils.getUpdateField(premaritalCheckup));
+                System.out.println(premaritalCheckup.getId());
                 mongoTemplate.updateFirst(query2, update2, PremaritalCheckup.class);
             }
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
index 29aa84e..4589056 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
@@ -87,7 +87,7 @@ public class BabyBuildController extends BaseController {
         Integer userId = loginState.getId();
         String hospitalId = autoMatchFacade.getHospitalId(userId);
 
-        if (request != null && !StringUtils.isEmpty(request.getId()) && ((request.getDataStatus() != null && !"1".equals(request.getDataStatus().toString())) || hospitalId.equals(request.getDeliverOrg()))) {
+        if (request != null && !StringUtils.isEmpty(request.getId()) && ((request.getDataStatus() != null && !"1".equals(request.getDataStatus().toString())))) {
             return babyBookbuildingFacade.updateBabyBookbuilding(request, userId);
         }
         return babyBookbuildingFacade.addBabyBookbuilding(request, loginState.getId());
-- 
1.8.3.1