Commit e2f7ae9aaf7976682923690e27e0fd4526e37509
1 parent
ea6c522ef8
Exists in
master
and in
6 other branches
诸城初诊,复诊接口
Showing 1 changed file with 39 additions and 17 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java
View file @
e2f7ae9
| ... | ... | @@ -82,6 +82,7 @@ |
| 82 | 82 | Map<String,Object> map = (Map)br.getData(); |
| 83 | 83 | List<Map<String,Object>> list = (List)map.get("placentas"); |
| 84 | 84 | List<Map<String,Object>> list1 = new ArrayList(); |
| 85 | + List<String> list2 = new ArrayList<>(); | |
| 85 | 86 | String fetalPosition = null; |
| 86 | 87 | String heartRate = null; |
| 87 | 88 | String fetalPresentation = null; |
| 88 | 89 | |
| 89 | 90 | |
| 90 | 91 | |
| 91 | 92 | |
| ... | ... | @@ -89,23 +90,32 @@ |
| 89 | 90 | /*String dueDate = map.get("dueDate").toString(); |
| 90 | 91 | String lastMenses = map.get("lastMenses").toString();*/ |
| 91 | 92 | |
| 92 | - | |
| 93 | 93 | if(list != null && list.size()>0){ |
| 94 | - for (int i = 0;i>list.size();i++){ | |
| 95 | - Map<String,String> map1 = new HashMap<String,String>(); | |
| 94 | + for(int i=0;i<list.size();i++){ | |
| 96 | 95 | fetalPosition = list.get(i).get("fetalPosition").toString();//胎方位 |
| 97 | 96 | heartRate = list.get(i).get("heartRate").toString();//心率 |
| 98 | 97 | fetalPresentation = list.get(i).get("fetalPresentation").toString();//胎先露 |
| 99 | 98 | join1 = list.get(i).get("join").toString();//衔接 |
| 99 | + String jsons="{\"fetalPosition\":"+fetalPosition+",\"heartRate\":"+heartRate+",\"fetalPresentation\":"+fetalPresentation+",\"join1\":"+join1+"}"; | |
| 100 | + list2.add(jsons); | |
| 101 | + } | |
| 102 | + } | |
| 103 | + | |
| 104 | + /*if(list != null && list.size()>0){ | |
| 105 | + for (int i = 0;i<list.size();i++){ | |
| 106 | + Map<String,Object> map1 = new HashMap<String,Object>(); | |
| 107 | + fetalPosition = list.get(i).get("fetalPosition").toString();//胎方位 | |
| 108 | + heartRate = list.get(i).get("heartRate").toString();//心率 | |
| 109 | + fetalPresentation = list.get(i).get("fetalPresentation").toString();//胎先露 | |
| 110 | + join1 = list.get(i).get("join").toString();//衔接 | |
| 100 | 111 | map1.put("fetalPosition",fetalPosition); |
| 101 | - map.put("heartRate",heartRate); | |
| 102 | - map.put("heartRate",heartRate); | |
| 103 | - map.put("fetalPresentation",fetalPresentation); | |
| 104 | - list1.add(map); | |
| 112 | + map1.put("heartRate",heartRate); | |
| 113 | + map1.put("heartRate",heartRate); | |
| 114 | + map1.put("fetalPresentation",fetalPresentation); | |
| 115 | + list1.add(map1); | |
| 105 | 116 | } |
| 106 | 117 | |
| 107 | - | |
| 108 | - } | |
| 118 | + }*/ | |
| 109 | 119 | /*String inSql = "insert into lyms_zccscz(id,name,idcard,vccardno,\n" + |
| 110 | 120 | "phone,genRemark,gynRemark,treatmentOpinion3,\n" + |
| 111 | 121 | "quicken,quickenRemark,resultSupple,syjgSelect,\n" + |
| ... | ... | @@ -214,8 +224,8 @@ |
| 214 | 224 | }else{ |
| 215 | 225 | ps.setString(12,null); |
| 216 | 226 | } |
| 217 | - if(map.get("hivkt") != null){ | |
| 218 | - ps.setString(13,map.get("hivkt").toString()); | |
| 227 | + if(map.get("hivktSelect") != null){ | |
| 228 | + ps.setString(13,map.get("hivktSelect").toString()); | |
| 219 | 229 | }else{ |
| 220 | 230 | ps.setString(13,null); |
| 221 | 231 | } |
| ... | ... | @@ -652,8 +662,8 @@ |
| 652 | 662 | }else{ |
| 653 | 663 | ps.setString(101,null); |
| 654 | 664 | } |
| 655 | - if(list1 != null && list1.size()>0){ | |
| 656 | - ps.setString(102,list1.toString()); | |
| 665 | + if(list2 != null && list2.size()>0){ | |
| 666 | + ps.setString(102,list2.toString()); | |
| 657 | 667 | }else{ |
| 658 | 668 | ps.setString(102,null); |
| 659 | 669 | } |
| ... | ... | @@ -734,6 +744,7 @@ |
| 734 | 744 | |
| 735 | 745 | |
| 736 | 746 | //新增数据 |
| 747 | + List<String> list2 = new ArrayList<>(); | |
| 737 | 748 | List<Map<String,Object>> list1 = new ArrayList<>(); |
| 738 | 749 | Map<String,Object> map = (Map)br.getData(); |
| 739 | 750 | List<Map<String,Object>> list = (List)map.get("tireData"); |
| ... | ... | @@ -743,7 +754,18 @@ |
| 743 | 754 | String join1 = null; |
| 744 | 755 | |
| 745 | 756 | if(list != null && list.size()>0){ |
| 746 | - for (int i = 0;i>list.size();i++){ | |
| 757 | + for(int i=0;i<list.size();i++){ | |
| 758 | + fetalPosition = list.get(i).get("fetalPosition").toString();//胎方位 | |
| 759 | + heartRate = list.get(i).get("heartRate").toString();//心率 | |
| 760 | + fetalPresentation = list.get(i).get("fetalPresentation").toString();//胎先露 | |
| 761 | + join1 = list.get(i).get("join").toString();//衔接 | |
| 762 | + String jsons="{\"fetalPosition\":"+fetalPosition+",\"heartRate\":"+heartRate+",\"fetalPresentation\":"+fetalPresentation+",\"join1\":"+join1+"}"; | |
| 763 | + list2.add(jsons); | |
| 764 | + } | |
| 765 | + } | |
| 766 | + | |
| 767 | + /*if(list != null && list.size()>0){ | |
| 768 | + for (int i = 0;i<list.size();i++){ | |
| 747 | 769 | Map<String,String> map1 = new HashMap<String,String>(); |
| 748 | 770 | fetalPosition = list.get(i).get("fetalPosition").toString();//胎方位 |
| 749 | 771 | heartRate = list.get(i).get("heartRate").toString();//心率 |
| ... | ... | @@ -756,7 +778,7 @@ |
| 756 | 778 | list1.add(map); |
| 757 | 779 | } |
| 758 | 780 | |
| 759 | - } | |
| 781 | + }*/ | |
| 760 | 782 | |
| 761 | 783 | /*String inSql = "insert into lyms_zccsfz(id,name,idcard,vccardno,\n" + |
| 762 | 784 | "phone,checkDate,currentDueDate,checkDoctor,\n" + |
| ... | ... | @@ -968,8 +990,8 @@ |
| 968 | 990 | }else{ |
| 969 | 991 | ps.setString(41,null); |
| 970 | 992 | } |
| 971 | - if(list1 != null && list1.size()>0){ | |
| 972 | - ps.setString(42,list1.toString()); | |
| 993 | + if(list2 != null && list2.size()>0){ | |
| 994 | + ps.setString(42,list2.toString()); | |
| 973 | 995 | }else{ |
| 974 | 996 | ps.setString(42,null); |
| 975 | 997 | } |