From e2f7ae9aaf7976682923690e27e0fd4526e37509 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Sat, 23 Jun 2018 11:31:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B8=E5=9F=8E=E5=88=9D=E8=AF=8A=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=8D=E8=AF=8A=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/hospitalapi/zcfy/ZcPrenatalService.java   | 56 +++++++++++++++-------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java
index 1bcc653..8b7c944 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java
@@ -82,6 +82,7 @@ public class ZcPrenatalService {
                         Map<String,Object> map = (Map)br.getData();
                         List<Map<String,Object>> list = (List)map.get("placentas");
                         List<Map<String,Object>> list1 = new ArrayList();
+                        List<String> list2 = new ArrayList<>();
                         String fetalPosition = null;
                         String heartRate = null;
                         String fetalPresentation = null;
@@ -89,23 +90,32 @@ public class ZcPrenatalService {
                         /*String dueDate = map.get("dueDate").toString();
                         String lastMenses = map.get("lastMenses").toString();*/
 
-
                         if(list != null && list.size()>0){
-                            for (int i = 0;i>list.size();i++){
-                                Map<String,String> map1 =  new HashMap<String,String>();
+                            for(int i=0;i<list.size();i++){
                                 fetalPosition = list.get(i).get("fetalPosition").toString();//胎方位
                                 heartRate = list.get(i).get("heartRate").toString();//心率
                                 fetalPresentation = list.get(i).get("fetalPresentation").toString();//胎先露
                                 join1 = list.get(i).get("join").toString();//衔接
-                                map1.put("fetalPosition",fetalPosition);
-                                map.put("heartRate",heartRate);
-                                map.put("heartRate",heartRate);
-                                map.put("fetalPresentation",fetalPresentation);
-                                list1.add(map);
+                                String jsons="{\"fetalPosition\":"+fetalPosition+",\"heartRate\":"+heartRate+",\"fetalPresentation\":"+fetalPresentation+",\"join1\":"+join1+"}";
+                                list2.add(jsons);
                             }
+                        }
 
+                        /*if(list != null && list.size()>0){
+                            for (int i = 0;i<list.size();i++){
+                                Map<String,Object> map1 =  new HashMap<String,Object>();
+                                fetalPosition = list.get(i).get("fetalPosition").toString();//胎方位
+                                heartRate = list.get(i).get("heartRate").toString();//心率
+                                fetalPresentation = list.get(i).get("fetalPresentation").toString();//胎先露
+                                join1 = list.get(i).get("join").toString();//衔接
+                                map1.put("fetalPosition",fetalPosition);
+                                map1.put("heartRate",heartRate);
+                                map1.put("heartRate",heartRate);
+                                map1.put("fetalPresentation",fetalPresentation);
+                                list1.add(map1);
+                            }
 
-                        }
+                        }*/
                         /*String inSql = "insert into lyms_zccscz(id,name,idcard,vccardno,\n" +
                                 "phone,genRemark,gynRemark,treatmentOpinion3,\n" +
                                 "quicken,quickenRemark,resultSupple,syjgSelect,\n" +
@@ -214,8 +224,8 @@ public class ZcPrenatalService {
                     }else{
                         ps.setString(12,null);
                     }
-                    if(map.get("hivkt") != null){
-                        ps.setString(13,map.get("hivkt").toString());
+                    if(map.get("hivktSelect") != null){
+                        ps.setString(13,map.get("hivktSelect").toString());
                     }else{
                         ps.setString(13,null);
                     }
@@ -652,8 +662,8 @@ public class ZcPrenatalService {
                     }else{
                         ps.setString(101,null);
                     }
-                    if(list1 != null && list1.size()>0){
-                        ps.setString(102,list1.toString());
+                    if(list2 != null && list2.size()>0){
+                        ps.setString(102,list2.toString());
                     }else{
                         ps.setString(102,null);
                     }
@@ -734,6 +744,7 @@ public class ZcPrenatalService {
 
 
                 //新增数据
+                List<String> list2 = new ArrayList<>();
                 List<Map<String,Object>> list1 = new ArrayList<>();
                 Map<String,Object> map = (Map)br.getData();
                 List<Map<String,Object>> list = (List)map.get("tireData");
@@ -743,7 +754,18 @@ public class ZcPrenatalService {
                 String join1 = null;
 
                 if(list != null && list.size()>0){
-                    for (int i = 0;i>list.size();i++){
+                    for(int i=0;i<list.size();i++){
+                        fetalPosition = list.get(i).get("fetalPosition").toString();//胎方位
+                        heartRate = list.get(i).get("heartRate").toString();//心率
+                        fetalPresentation = list.get(i).get("fetalPresentation").toString();//胎先露
+                        join1 = list.get(i).get("join").toString();//衔接
+                        String jsons="{\"fetalPosition\":"+fetalPosition+",\"heartRate\":"+heartRate+",\"fetalPresentation\":"+fetalPresentation+",\"join1\":"+join1+"}";
+                        list2.add(jsons);
+                    }
+                }
+
+                /*if(list != null && list.size()>0){
+                    for (int i = 0;i<list.size();i++){
                         Map<String,String> map1 =  new HashMap<String,String>();
                         fetalPosition = list.get(i).get("fetalPosition").toString();//胎方位
                         heartRate = list.get(i).get("heartRate").toString();//心率
@@ -756,7 +778,7 @@ public class ZcPrenatalService {
                         list1.add(map);
                     }
 
-                }
+                }*/
 
                 /*String inSql = "insert into lyms_zccsfz(id,name,idcard,vccardno,\n" +
                         "phone,checkDate,currentDueDate,checkDoctor,\n" +
@@ -968,8 +990,8 @@ public class ZcPrenatalService {
                 }else{
                     ps.setString(41,null);
                 }
-                if(list1 != null && list1.size()>0){
-                    ps.setString(42,list1.toString());
+                if(list2 != null && list2.size()>0){
+                    ps.setString(42,list2.toString());
                 }else{
                     ps.setString(42,null);
                 }
-- 
1.8.3.1