From 1d28fbca3e8396a8000c0d6954e282e1965694b8 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Fri, 20 Nov 2020 17:32:05 +0800
Subject: [PATCH] update

---
 .../java/com/lyms/platform/pojo/BabySieveQhdModel.java     |  8 ++++++--
 .../lyms/platform/operate/web/facade/BabySieveFacede.java  | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java
index b14c926..d4040a1 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java
@@ -98,7 +98,7 @@ public class BabySieveQhdModel extends BaseModel {
     private String duescfs;
     //性别  男  女
     private String sex;
-    //35种疾病筛查
+    //35种疾病筛查 0 否  1 是
     private String diseaseSieve;
     //母乳次数：（是否充分哺乳）0 否  1 是
     private String buruSum;
@@ -467,7 +467,11 @@ public class BabySieveQhdModel extends BaseModel {
         if(StringUtils.isNotEmpty(sex)){
             map.put("sex",SexEnum.getTextById(Integer.parseInt(sex)));
         }
-        map.put("diseaseSieve",diseaseSieve);
+        if("0".equals(diseaseSieve)){
+            map.put("diseaseSieve","否");
+        }else if("1".equals(diseaseSieve)){
+            map.put("diseaseSieve","是");
+        }
         if("0".equals(buruSum)){
             map.put("buruSum","否");
         }else if("1".equals(buruSum)){
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
index 2f41fde..4ff3647 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
@@ -683,8 +683,18 @@ public class BabySieveFacede {
                 e.printStackTrace();
             }
         }
-        //新筛四病
-        babyModelQuery.setTestItem(babySieveAddQhdRequest.getTestItem());
+        if(StringUtils.isNotEmpty(babySieveAddQhdRequest.getTestItem()) ){
+            String testItem = babySieveAddQhdRequest.getTestItem();
+            String substring1 = testItem.substring(testItem.length() - 1, testItem.length());
+            if(",".equals(substring1) && babySieveAddQhdRequest.getTestItem().contains(",")){
+                String substring = babySieveAddQhdRequest.getTestItem().substring(0, babySieveAddQhdRequest.getTestItem().length() - 1);
+                babyModelQuery.setTestItem(testItem.substring(0, testItem.length()-1));
+            }else {
+                //新筛四病
+                babyModelQuery.setTestItem(babySieveAddQhdRequest.getTestItem());
+            }
+        }
+
         //串联实验项目 MSMS 或空
         babyModelQuery.setMsms(babySieveAddQhdRequest.getMsms());
         //新筛血卡编号
-- 
1.8.3.1