From 67173248e2391ffa982c0cc7f831beb51be72c42 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 10 Jul 2018 16:09:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=84=BF=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/BabyCheckFacade.java        |  3 +-
 .../operate/web/facade/MatDeliverFacade.java       |  3 +-
 .../operate/web/request/AntExAddRequest.java       | 66 ++++++++++++++++++++++
 3 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index 5fe04e9..0419925 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -1760,7 +1760,8 @@ public class BabyCheckFacade {
         BabyModelQuery babyQuery = new BabyModelQuery();
         babyQuery.setYn(YnEnums.YES.getId());
 
-        List<BabyCheckModel> babyCheckList = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.DESC);
+//        List<BabyCheckModel> babyCheckList = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.DESC);
+        List<BabyCheckModel> babyCheckList = babyCheckService.queryBabyCheckRecord(query);
         List<BabyModel> babyModels = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(babyCheckList))
         {
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 cfc62fc..932b900 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
@@ -2203,7 +2203,8 @@ public class MatDeliverFacade {
     public NewBabyManagerResult newBabyManager(NewBabyManagerRequest newBabyManagerRequest) {
         NewBabyManagerResult newBabyManagerResult = new NewBabyManagerResult();
         BabyModelQuery babyModelQuery = new BabyModelQuery();
-        babyModelQuery.setYn(YnEnums.YES.getId());
+        //babyModelQuery.setYn(YnEnums.YES.getId());
+        babyModelQuery.setDataStatus(false);
         babyModelQuery.setQueryNo(StringUtils.isEmpty(newBabyManagerRequest.getQueryNo()) ? null : newBabyManagerRequest.getQueryNo());
         if (StringUtils.isNotEmpty(newBabyManagerRequest.getBirthDate())) {
             try {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
index 8d1e50d..8f126ea 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
@@ -190,6 +190,72 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     //心电图
     public String electr;
 
+
+    /**承德区域功能*****/
+
+
+//    //血红蛋白值
+//    private String xhdb;
+//    //白细胞计数值
+//    private String bxbjs;
+//    // 血小板
+//    private String platelet;
+//    //血常规其他
+//    private String chgOther;
+//    //尿蛋白
+//    private String ndb;
+//    //尿糖
+//    private String nt;
+//    //尿同体
+//    private String urineKetone;
+//    //尿潜血
+//    private String bld;
+//    //尿常规其他
+//    private String ncgOther;
+//    //血型
+//    private String abo;
+//    //RH血型
+//    private String rh;
+//    // 血糖1
+//    private String bloodSugar;
+//
+//    //血清谷丙转氨酶
+//    private String xqgbzam;
+//    //血清谷草转氨酶
+//    private String xqgczam;
+//    //白蛋白
+//    private String albumin;
+//    //总胆红素
+//    private String totalBilirubin;
+//    //结合胆红素
+//    private String jhBilirubin;
+//
+//    //丙肝
+//    private String bg;
+//    // 乙肝表面抗原
+//    private String ygbmky;
+//    //乙肝表面抗体
+//    private String ygbmkt;
+//    //乙肝e抗原
+//    private String ygeky;
+//    // 乙肝e抗体
+//    private String ygekt;
+//    // 乙肝核心抗体
+//    private String yghxkt;
+//
+//    //血清肌
+//    private String xqjq;
+//    //血尿素氮
+//    private String xnsd;
+//
+//    //实验结果
+//    private String syjg;
+//
+//    //hit抗体检测
+//    private String hivkt;
+
+    /**承德区域功能*****/
+
     public List<String> mHighRiskReason;
 
     public String getLisCheckItems() {
-- 
1.8.3.1