From 71bc17bde92d41cf8a0f19e289bf79cac7e620df Mon Sep 17 00:00:00 2001
From: hujiaqi <hujiaqi@lymsh.com>
Date: Wed, 28 Dec 2016 10:15:58 +0800
Subject: [PATCH] bug

---
 .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 14 +++++++-------
 .../operate/web/result/PatientManagerQueryModel.java       | 10 ++++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index b7af807..33af0c6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -1063,7 +1063,7 @@ public class MatDeliverFacade {
                     childbirthManagerQueryModel.setPatientId(patients.getId());
                     childbirthManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId());
                     // 居住地
-                    if (childbirthManagerRequest.getInitQuery().contains("address")) {
+                    if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&childbirthManagerRequest.getInitQuery().contains("address")) {
                         childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
                     }
                     // 电话转换
@@ -1072,7 +1072,7 @@ public class MatDeliverFacade {
                     // 加密身份证号
                     childbirthManagerQueryModel.setCardNo(DefenceUtils.getId(patients.getCardNo()));
                     // 查询分娩方式
-                    if (childbirthManagerRequest.getInitQuery().contains("deliveryMode")) {
+                    if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&childbirthManagerRequest.getInitQuery().contains("deliveryMode")) {
                         String deliveryModeJson = maternalDeliverModel.getDeliveryMode();
                         Map<String, String> deliveryModeMap = JsonUtil.getMap(deliveryModeJson);
                         if (MapUtils.isNotEmpty(deliveryModeMap) && StringUtils.isNotEmpty(deliveryModeMap.get("fmfs"))) {
@@ -1087,7 +1087,7 @@ public class MatDeliverFacade {
                         }
                     }
                     // 产妇情况
-                    if (childbirthManagerRequest.getInitQuery().contains("maternalInfo")) {
+                    if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&childbirthManagerRequest.getInitQuery().contains("maternalInfo")) {
                         if (StringUtils.isNotBlank(maternalDeliverModel.getMaternalInfo())) {
                             for (CfEnums cfEnums : CfEnums.values()) {
                                 if (cfEnums.getId().equals(maternalDeliverModel.getMaternalInfo())) {
@@ -1099,7 +1099,7 @@ public class MatDeliverFacade {
                     }
                     // 查询接生医生
                     try {
-                        if (childbirthManagerRequest.getInitQuery().contains("deliverDoctor")) {
+                        if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&childbirthManagerRequest.getInitQuery().contains("deliverDoctor")) {
                             childbirthManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName());
                         }
                     } catch (Exception e) {
@@ -1107,7 +1107,7 @@ public class MatDeliverFacade {
                     }
                     childbirthManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth()));
                     // 查询活产数
-                    if (childbirthManagerRequest.getInitQuery().contains("livingNumber")) {
+                    if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&childbirthManagerRequest.getInitQuery().contains("livingNumber")) {
                         BabyModelQuery babyModelQuery = new BabyModelQuery();
                         babyModelQuery.setYn(YnEnums.YES.getId());
                         babyModelQuery.setParentId(patients.getId());
@@ -1189,7 +1189,7 @@ public class MatDeliverFacade {
 
                     // 开始拼装自定义查询结果
                     // 胎方位，胎心率，胎先露
-                    if (childbirthManagerRequest.getInitQuery().contains("fetalPosition") || childbirthManagerRequest.getInitQuery().contains("heartRate") || childbirthManagerRequest.getInitQuery().contains("fetalPresentation")) {
+                    if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&(childbirthManagerRequest.getInitQuery().contains("fetalPosition") || childbirthManagerRequest.getInitQuery().contains("heartRate") || childbirthManagerRequest.getInitQuery().contains("fetalPresentation"))) {
                         // 这个泛型不会出错，传入的就是这个
                         @SuppressWarnings("unchecked")
                         List<MatDeliverAddRequest.Placenta> placentaList = maternalDeliverModel.getPlacentas();
@@ -1260,7 +1260,7 @@ public class MatDeliverFacade {
                         childbirthManagerQueryModel.setChBpSzy1(chBpMap.get("szy"));
                     }
                     // 胎盘娩出方式，胎盘大小，胎盘重量，脐带长度，脐带是否异常，脐带异常类型
-                    if (childbirthManagerRequest.getInitQuery().contains("tpmcType") || childbirthManagerRequest.getInitQuery().contains("tpSize") || childbirthManagerRequest.getInitQuery().contains("tpWeight") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordLength") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordEx") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordExType")) {
+                    if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&(childbirthManagerRequest.getInitQuery().contains("tpmcType") || childbirthManagerRequest.getInitQuery().contains("tpSize") || childbirthManagerRequest.getInitQuery().contains("tpWeight") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordLength") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordEx") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordExType"))) {
                         List<MaternalDeliverModel.ExtPlacenta> extPlacentaList = maternalDeliverModel.getExtPlacentas();
                         if (CollectionUtils.isNotEmpty(extPlacentaList)) {
                             String tpmcType = "";
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
index 97860f5..7b78e40 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
@@ -72,6 +72,16 @@ public class PatientManagerQueryModel {
 
     private String id;
 
+    private String cardNo;
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
     public String getId() {
         return id;
     }
-- 
1.8.3.1