From ac607287b0a868a82045f12d363bb64157743e48 Mon Sep 17 00:00:00 2001
From: wtt <1872109740@qq.com>
Date: Tue, 19 Jan 2021 10:00:47 +0800
Subject: [PATCH] update

---
 .../common/enums/BabyAutoDiagnoseEnums.java        |  3 ++-
 .../lyms/platform/pojo/MaternalDeliverModel.java   | 10 ++++++++++
 .../web/facade/BabyAutoDiagnoseRiskFacade.java     | 23 ++++++++++++++++++++--
 .../web/request/BabyAutoRiskInfoRequest.java       | 11 +++++++++++
 .../operate/web/request/MatDeliverAddRequest.java  | 11 +++++++++++
 5 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/BabyAutoDiagnoseEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/BabyAutoDiagnoseEnums.java
index 59c487a..c673687 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/BabyAutoDiagnoseEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/BabyAutoDiagnoseEnums.java
@@ -23,7 +23,8 @@ public class BabyAutoDiagnoseEnums {
         zxfz(9, "窒息分钟"),
         ts(10, "胎数"),
         tz(11, "体重"),
-        xhdb(12, "血红蛋白");
+        xhdb(12, "血红蛋白"),
+        fypj(13, "体格发育评价");
 
         private int id;
         private String title;
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
index b72faa6..ffbc4e7 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
@@ -542,6 +542,8 @@ public class MaternalDeliverModel extends BaseModel {
         private String babyWeight;
         //新生儿血红蛋白，自动诊断使用
         private String babyXhdb;
+        //儿保检查 体格发育评价
+        private String babyFypj;
         //新生儿生长
         private String babyHeight;
         //畸形 0非畸形 1畸形
@@ -732,6 +734,14 @@ public class MaternalDeliverModel extends BaseModel {
             this.babyXhdb = babyXhdb;
         }
 
+        public String getBabyFypj() {
+            return babyFypj;
+        }
+
+        public void setBabyFypj(String babyFypj) {
+            this.babyFypj = babyFypj;
+        }
+
         public String getBabyQX() {
             return babyQX;
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java
index e594feb..b94921a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java
@@ -455,8 +455,27 @@ public class BabyAutoDiagnoseRiskFacade {
                     }
                 }
             }
-
-
+            /*
+            * 儿保检查 体格发育评价 13
+            */
+            if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.fypj.getId()) && maternalDeliverModel.getBaby() != null) {
+                List<MaternalDeliverModel.Baby> baby = maternalDeliverModel.getBaby();
+                if (CollectionUtils.isNotEmpty(baby)) {
+                    MaternalDeliverModel.Baby baby1 = baby.get(ii);
+                    if (baby1 != null) {
+                        List<DiagnoseItemModel> items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.fypj.getId());
+                        if (type == 2 && CollectionUtils.isNotEmpty(items) && StringUtils.isNotEmpty(baby1.getBabyFypj())) {
+                            String babyFypj = baby1.getBabyFypj().toString();
+                            for (DiagnoseItemModel item : items) {
+                                String valueTwo = item.getValueTwo();
+                                if (valueTwo.equals(babyFypj) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                    list.addAll(item.getRiskIds());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
 
         if (list.size() > 0) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskInfoRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskInfoRequest.java
index 6f5c3d5..713c36c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskInfoRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskInfoRequest.java
@@ -24,6 +24,8 @@ public class BabyAutoRiskInfoRequest implements IBasicRequestConvert <BabyAutoRi
     private String babyWeight;
     //血红蛋白
     private String babyXhdb;
+    //儿保检查 体格发育评价
+    private String babyFypj;
     //apgar评分
     private Map apgarScore;
     //分娩孕周
@@ -106,6 +108,7 @@ public class BabyAutoRiskInfoRequest implements IBasicRequestConvert <BabyAutoRi
         MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby();
         baby.setBabyWeight(babyWeight);
         baby.setBabyXhdb(babyXhdb);
+        baby.setBabyFypj(babyFypj);
         baby.setApgarScore(apgarScore);
         baby.setJxWn(jxWn);
         baby.setJxJzl(jxJzl);
@@ -137,6 +140,14 @@ public class BabyAutoRiskInfoRequest implements IBasicRequestConvert <BabyAutoRi
         return babyAutoRiskRequest;
     }
 
+    public String getBabyFypj() {
+        return babyFypj;
+    }
+
+    public void setBabyFypj(String babyFypj) {
+        this.babyFypj = babyFypj;
+    }
+
     public List <String> getRiskFactorId() {
         return riskFactorId;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
index 5cafd93..a80e260 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
@@ -1209,6 +1209,8 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
         private String babyWeight;
         //新生儿血红蛋白，自动诊断使用
         private String babyXhdb;
+        //儿保检查 体格发育评价
+        private String babyFypj;
         //新生儿生长
         private String babyHeight;
         //畸形 0非畸形 1畸形
@@ -1410,6 +1412,14 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
             this.babyXhdb = babyXhdb;
         }
 
+        public String getBabyFypj() {
+            return babyFypj;
+        }
+
+        public void setBabyFypj(String babyFypj) {
+            this.babyFypj = babyFypj;
+        }
+
         @Override
         public MaternalDeliverModel.Baby convertToDataModel() {
             MaternalDeliverModel.Baby baby = new MaternalDeliverModel.Baby();
@@ -1424,6 +1434,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
             baby.setBabyHealthy(babyHealthy);
             baby.setBabyWeight(babyWeight);
             baby.setBabyXhdb(babyXhdb);
+            baby.setBabyFypj(babyFypj);
             baby.setBabyHeight(babyHeight);
             baby.setDeformity(deformity);
             baby.setPregnancyOut(pregnancyOut);
-- 
1.8.3.1