From 32737a1a6d554c8c929f16ab629e4f3b4718fd45 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Fri, 11 Feb 2022 09:08:22 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/pojo/CervixVisitModel.java   |  4 +-
 .../service/impl/CervicalCancerServiceImpl.java    | 67 ++++++++++++----------
 2 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitModel.java
index 1dc25be..335fd28 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitModel.java
@@ -67,7 +67,9 @@ public class CervixVisitModel extends BaseModel {
     //阴道活检诊断
     private String ydhjzd;
 
-    //常规推荐
+   /**
+    *常规推荐
+    */
     //随访时间段（1年内追访、3年内随访、5年内随访）
     //阴道镜检查
     //阴道镜治疗
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
index a59de5c..552c0fd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
@@ -801,40 +801,47 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
     //宫颈追访业务 type:1：新增、2：修改
     public void cervixVisitAdd(CervicalCancerRequest cervicalCancerRequest,int type) {
         try {
-            if(null!=cervicalCancerRequest){
+            if(null!=cervicalCancerRequest && MapUtils.isNotEmpty(cervicalCancerRequest.getFormData()) &&
+                    (null!=cervicalCancerRequest.getFormData().get("hpv")||
+                    null!=cervicalCancerRequest.getFormData().get("xbx")||
+                    null!=cervicalCancerRequest.getFormData().get("cin")||
+                    null!=cervicalCancerRequest.getFormData().get("cin23")||
+                    null!=cervicalCancerRequest.getFormData().get("hpvym")||
+                    null!=cervicalCancerRequest.getFormData().get("xshpv")||
+                    null!=cervicalCancerRequest.getFormData().get("hpvjc")||
+                    null!=cervicalCancerRequest.getFormData().get("xsxbx")||
+                    null!=cervicalCancerRequest.getFormData().get("ydhjzd")
+                    )){
                 CervixVisitModel cervixVisitModel=new CervixVisitModel();
                 //下次预约时间逻辑
                 cervixVisitModel.setNextAfterVisitTime(cervicalCancerRequest.getCreated());
                 //宫颈检查追访项
-                if(MapUtils.isNotEmpty(cervicalCancerRequest.getFormData())){
-                    if(null!=cervicalCancerRequest.getFormData().get("hpv")){
-                        cervixVisitModel.setHpv(cervicalCancerRequest.getFormData().get("hpv").toString());
-                    }
-                    if(null!=cervicalCancerRequest.getFormData().get("xbx")){
-                        cervixVisitModel.setXbx(cervicalCancerRequest.getFormData().get("xbx").toString());
-                    }
-                    if(null!=cervicalCancerRequest.getFormData().get("cin")){
-                        cervixVisitModel.setCin(cervicalCancerRequest.getFormData().get("cin").toString());
-                    }
-                    if(null!=cervicalCancerRequest.getFormData().get("cin23")){
-                        cervixVisitModel.setCin23(cervicalCancerRequest.getFormData().get("cin23").toString());
-                    }
-                    if(null!=cervicalCancerRequest.getFormData().get("hpvym")){
-                        cervixVisitModel.setHpvym(cervicalCancerRequest.getFormData().get("hpvym").toString());
-                    }
-                    if(null!=cervicalCancerRequest.getFormData().get("xshpv")){
-                        cervixVisitModel.setXshpv(cervicalCancerRequest.getFormData().get("xshpv").toString());
-                    }
-                    if(null!=cervicalCancerRequest.getFormData().get("hpvjc")){
-                        cervixVisitModel.setHpvjc(cervicalCancerRequest.getFormData().get("hpvjc").toString());
-                    }
-                    if(null!=cervicalCancerRequest.getFormData().get("xsxbx")){
-                        cervixVisitModel.setXsxbx(cervicalCancerRequest.getFormData().get("xsxbx").toString());
-                    }
-                    if(null!=cervicalCancerRequest.getFormData().get("ydhjzd")){
-                        cervixVisitModel.setYdhjzd(cervicalCancerRequest.getFormData().get("ydhjzd").toString());
-                    }
-
+                if(null!=cervicalCancerRequest.getFormData().get("hpv")){
+                    cervixVisitModel.setHpv(cervicalCancerRequest.getFormData().get("hpv").toString());
+                }
+                if(null!=cervicalCancerRequest.getFormData().get("xbx")){
+                    cervixVisitModel.setXbx(cervicalCancerRequest.getFormData().get("xbx").toString());
+                }
+                if(null!=cervicalCancerRequest.getFormData().get("cin")){
+                    cervixVisitModel.setCin(cervicalCancerRequest.getFormData().get("cin").toString());
+                }
+                if(null!=cervicalCancerRequest.getFormData().get("cin23")){
+                    cervixVisitModel.setCin23(cervicalCancerRequest.getFormData().get("cin23").toString());
+                }
+                if(null!=cervicalCancerRequest.getFormData().get("hpvym")){
+                    cervixVisitModel.setHpvym(cervicalCancerRequest.getFormData().get("hpvym").toString());
+                }
+                if(null!=cervicalCancerRequest.getFormData().get("xshpv")){
+                    cervixVisitModel.setXshpv(cervicalCancerRequest.getFormData().get("xshpv").toString());
+                }
+                if(null!=cervicalCancerRequest.getFormData().get("hpvjc")){
+                    cervixVisitModel.setHpvjc(cervicalCancerRequest.getFormData().get("hpvjc").toString());
+                }
+                if(null!=cervicalCancerRequest.getFormData().get("xsxbx")){
+                    cervixVisitModel.setXsxbx(cervicalCancerRequest.getFormData().get("xsxbx").toString());
+                }
+                if(null!=cervicalCancerRequest.getFormData().get("ydhjzd")){
+                    cervixVisitModel.setYdhjzd(cervicalCancerRequest.getFormData().get("ydhjzd").toString());
                 }
                 if(type==1) {
                     cervixVisitModel.setParentId(cervicalCancerRequest.getId());
-- 
1.8.3.1