From 630d65e991b7f670f41ea57c4c776fa4126ad63f Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 21 Dec 2021 09:48:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=89=8D=E4=BC=98=E7=94=9F=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/common/Test.java   | 29 +++++++++++++++++---
 .../com/lyms/hospitalapi/lhxfy/LhxfyService.java   | 31 ++++++++++++++++++----
 2 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/Test.java b/platform-common/src/main/java/com/lyms/platform/common/Test.java
index 7795060..8f45970 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/Test.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/Test.java
@@ -4,6 +4,8 @@ package com.lyms.platform.common;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.StringUtils;
 
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
 import java.util.Date;
 
 public class Test {
@@ -41,11 +43,30 @@ public class Test {
     }
 
     //504F533838383834  POS88884
-    public static void main(String[] args) {
-
-        Test strToHex = new Test();
+    public static void main(String[] args) throws UnsupportedEncodingException {
+        String[] xxbfx = new String[9];
+        for(String key : xxbfx)
+           if (key == null)
+           {
+           }
+
+        Integer[] yigan = new Integer[]{-1,-1,-1,-1,-1};
+        for(Integer key : yigan)
+           if (key == -1)
+           {
+               System.out.println(key);
+           }
+    }
 
-        System.out.println("ASCII : " + strToHex.convertHexToString("31"));
+    public static void print() {
+        int start=0;
+        byte[] bytes=new byte[s.length()/2];
+        int j=0;
+        for (int i =0;i<s.length();i+=2){
+            bytes[j++]= (byte) Integer.parseInt(s.substring(start,start+2),16);
+        }
+        System.out.println(Arrays.toString(bytes));
     }
+    private static  String s="B0F8FB80808080808080F880808080F880F88080F880F8808080F8F88080F880808080F8F880F8F88080F8B0F8FB80808080808080F880808080F880F88080F880F8808080F8F88080F880808080F8F880F8F88080F8";
 
 }
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 fdaee03..d1ba86e 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
@@ -106,6 +106,26 @@ public class LhxfyService {
         return null;
     }
 
+    private boolean hasValStrArry(String[] varry)
+    {
+        for(String key : varry)
+        if (key != null)
+        {
+            return true;
+        }
+        return false;
+    }
+
+    private boolean hasValIntArry(Integer[] varry)
+    {
+        for(Integer key : varry)
+            if (key != -1)
+            {
+                return true;
+            }
+        return false;
+    }
+
     public void autoInLis()
     {
         Query query = new Query();
@@ -471,9 +491,9 @@ public class LhxfyService {
                             }
                         }
                     }
-                    wifeClinicalCheck.put("bdjc",bdjc);
-                    wifeClinicalCheck.put("xxbfx",xxbfx);
-                    wifeClinicalCheck.put("yigan",yigan);
+                    wifeClinicalCheck.put("bdjc",hasValIntArry(bdjc) ? bdjc : wifeClinicalCheck.get("bdjc"));
+                    wifeClinicalCheck.put("xxbfx",hasValStrArry(xxbfx) ? xxbfx : wifeClinicalCheck.get("xxbfx"));
+                    wifeClinicalCheck.put("yigan",hasValIntArry(yigan) ? yigan : wifeClinicalCheck.get("yigan"));
                     wifeClinicalCheck.put("ncg",ncg);
 
                     preEugenicsBaseModel.setWifeClinicalCheck(wifeClinicalCheck);
@@ -625,7 +645,7 @@ public class LhxfyService {
                             }
                         }
                     }
-                    husbandClinicalCheck.put("yigan",hyigan);
+                    husbandClinicalCheck.put("yigan",hasValIntArry(hyigan) ? yigan : husbandClinicalCheck.get("yigan"));
                     husbandClinicalCheck.put("ncg",hncg);
                     preEugenicsBaseModel.setHusbandClinicalCheck(husbandClinicalCheck);
                 }
@@ -955,7 +975,7 @@ public class LhxfyService {
      * 孕前优生-上传省平台
      */
 //    private static final String URL = "http://39.101.222.193:8088";//测试
-//    private static final String KEY = "71d794fdb6ca4ef58c416830d31aabd9";//沧州测试key
+//    private static final String KEY = "4617b53f3867410c8b2d5fc9da11e6d1";//沧州测试key
     private static final String URL = "http://27.128.184.172:8087";//正式
     private static final String KEY = "04a5ad7515de40d3b1f7a7f1624daf10";//正式key
     public BaseResponse uploadingProvince(List<String> ids){
@@ -1485,6 +1505,7 @@ public class LhxfyService {
         Date end = DateUtil.parseYMD(endDate);
         end = DateUtil.getDayLastSecond(end);
 
+        tquery.addCriteria(Criteria.where("husbandCardNo").is("130825199411302419"));
         tquery.addCriteria(Criteria.where("hospitalId").is("2100001605"));
         tquery.addCriteria(Criteria.where("fillDate").gte(start).lte(end));
         List<PreEugenicsBaseModel> modelList = mongoTemplate.find(tquery, PreEugenicsBaseModel.class);
-- 
1.8.3.1