Commit f0bbc4d337f3ed531290b395325729a360fd40a2
1 parent
623f332b16
Exists in
master
and in
6 other branches
诸城妇幼分娩接口流程梳理完成
Showing 3 changed files with 39 additions and 42 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java
View file @
f0bbc4d
... | ... | @@ -77,6 +77,34 @@ |
77 | 77 | private String ccThree; //用来接收乐陵第三产程中间转化字段 |
78 | 78 | private String total; //用来接收乐陵总产程中间转换字段 |
79 | 79 | |
80 | + private String SBABY_APGAR_SCORE_ONE; //APGAR评分 1分钟 接收处理诸城评分有"转"值的数据 | |
81 | + private String SBABY_APGAR_SCORE_FIVE;//APGAR评分 5分钟 | |
82 | + private String SBABY_APGAR_SCORE_TEN; //APGAR评分 10分钟 | |
83 | + | |
84 | + public String getSBABY_APGAR_SCORE_ONE() { | |
85 | + return SBABY_APGAR_SCORE_ONE; | |
86 | + } | |
87 | + | |
88 | + public void setSBABY_APGAR_SCORE_ONE(String SBABY_APGAR_SCORE_ONE) { | |
89 | + this.SBABY_APGAR_SCORE_ONE = SBABY_APGAR_SCORE_ONE; | |
90 | + } | |
91 | + | |
92 | + public String getSBABY_APGAR_SCORE_FIVE() { | |
93 | + return SBABY_APGAR_SCORE_FIVE; | |
94 | + } | |
95 | + | |
96 | + public void setSBABY_APGAR_SCORE_FIVE(String SBABY_APGAR_SCORE_FIVE) { | |
97 | + this.SBABY_APGAR_SCORE_FIVE = SBABY_APGAR_SCORE_FIVE; | |
98 | + } | |
99 | + | |
100 | + public String getSBABY_APGAR_SCORE_TEN() { | |
101 | + return SBABY_APGAR_SCORE_TEN; | |
102 | + } | |
103 | + | |
104 | + public void setSBABY_APGAR_SCORE_TEN(String SBABY_APGAR_SCORE_TEN) { | |
105 | + this.SBABY_APGAR_SCORE_TEN = SBABY_APGAR_SCORE_TEN; | |
106 | + } | |
107 | + | |
80 | 108 | public String getSxl() { |
81 | 109 | return sxl; |
82 | 110 | } |
platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java
View file @
f0bbc4d
... | ... | @@ -102,7 +102,7 @@ |
102 | 102 | String startStr = fmt.format(start); |
103 | 103 | String endStr = fmt.format(end); |
104 | 104 | System.out.println("start=" + startStr + "end=" + endStr); |
105 | - //queryFmPatient(startStr, endStr, null); | |
105 | + queryFmPatient(startStr, endStr, null); | |
106 | 106 | } |
107 | 107 | |
108 | 108 | public void syncByPhone(String startStr,String endStr,String phone) { |
platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcfyFmService.java
View file @
f0bbc4d
... | ... | @@ -105,7 +105,7 @@ |
105 | 105 | String startStr = fmt.format(start); |
106 | 106 | String endStr = fmt.format(end); |
107 | 107 | System.out.println("start=" + startStr + "end=" + endStr); |
108 | - //queryFmPatient(startStr, endStr, null); | |
108 | + queryFmPatient(startStr, endStr, null); | |
109 | 109 | } |
110 | 110 | |
111 | 111 | public void syncByPhone(String startStr,String endStr,String phone) { |
112 | 112 | |
... | ... | @@ -128,19 +128,13 @@ |
128 | 128 | " FETUS_NUM as FETUS_NUM,\n" + |
129 | 129 | " to_number(BABY_WEIGHT) as BABY_WEIGHT,\n" + |
130 | 130 | " to_number(BABY_HEIGHT) as BABY_HEIGHT,\n" + |
131 | - " to_number(BABY_APGAR_SCORE_ONE) as BABY_APGAR_SCORE_ONE,\n" + | |
132 | - " to_number(BABY_APGAR_SCORE_FIVE) as BABY_APGAR_SCORE_FIVE,\n" + | |
133 | - " to_number(BABY_APGAR_SCORE_TEN) as BABY_APGAR_SCORE_TEN,\n" + | |
131 | + " BABY_APGAR_SCORE_ONE as SBABY_APGAR_SCORE_ONE,\n" + | |
132 | + " BABY_APGAR_SCORE_FIVE as SBABY_APGAR_SCORE_FIVE,\n" + | |
133 | + " BABY_APGAR_SCORE_TEN as SBABY_APGAR_SCORE_TEN,\n" + | |
134 | 134 | " BABY_PREGNANCY_OUT as BABY_PREGNANCY_OUT,\n" + |
135 | 135 | " DELIVERY_MODE as DELIVERY_MODE,\n" + |
136 | 136 | " MATERNAL_INFO as MATERNAL_INFO,\n" + |
137 | 137 | " PERINEAL_CONDITION as PERINEAL_CONDITION,\n" + |
138 | - //" DELIVER_DOCTOR as DELIVER_DOCTOR,\n" + | |
139 | - //" PROD_PROCESS_ONE as PROD_PROCESS_ONE,\n" + | |
140 | - // " 第二期 as PROD_PROCESS_TWO,\n" + | |
141 | - // " 第三期 as PROD_PROCESS_THREE,\n" + | |
142 | - //" 总计 as TOTAL_PROCESS,\n" + | |
143 | - //" CONVERT(int,胎盘数量) as PLACENTA_NUM,\n" + | |
144 | 138 | " DELIVER_HOSPITAL as DELIVER_HOSPITAL,\n" + |
145 | 139 | " ADDR as ADDR,\n"+ |
146 | 140 | " DELIVER_DOCTOR as DELIVER_DOCTOR"; |
... | ... | @@ -209,31 +203,6 @@ |
209 | 203 | continue; |
210 | 204 | } |
211 | 205 | |
212 | - //将中间字段的值整理赋值到正式字段中 | |
213 | - /*int sxl = allFm.getSxl().length(); | |
214 | - allFm.setSH_LOSE_BLOOD(Integer.parseInt(allFm.getSxl().substring(0,sxl-2)));//失血量 | |
215 | - | |
216 | - String[] oneShi = allFm.getCcOne().split("时"); | |
217 | - int one = Integer.parseInt(oneShi[0])*60; | |
218 | - String[] oneFen = oneShi[1].split("分"); | |
219 | - allFm.setPROD_PROCESS_ONE(one+Integer.parseInt(oneFen[0]));//第一产程 | |
220 | - | |
221 | - String[] twoShi = allFm.getCcTwo().split("时"); | |
222 | - int two = Integer.parseInt(twoShi[0])*60; | |
223 | - String[] twoFen = twoShi[1].split("分"); | |
224 | - allFm.setPROD_PROCESS_TWO(two+Integer.parseInt(twoFen[0]));//第二产程 | |
225 | - | |
226 | - String[] threeShi = allFm.getCcThree().split("时"); | |
227 | - int three = Integer.parseInt(threeShi[0])*60; | |
228 | - String[] threeFen = threeShi[1].split("分"); | |
229 | - allFm.setPROD_PROCESS_THREE(three+Integer.parseInt(threeFen[0]));//第三产程 | |
230 | - | |
231 | - String[] totalShi = allFm.getTotal().split("时"); | |
232 | - int total = Integer.parseInt(totalShi[0])*60; | |
233 | - String[] totalFen = totalShi[1].split("分"); | |
234 | - allFm.setTOTAL_PROCESS(String.valueOf(total+Integer.parseInt(totalFen[0])));//总产程 | |
235 | -*/ | |
236 | - | |
237 | 206 | PatientsQuery query = new PatientsQuery(); |
238 | 207 | query.setYn(YnEnums.YES.getId()); |
239 | 208 | query.setType(1); //孕妇 |
240 | 209 | |
241 | 210 | |
242 | 211 | |
... | ... | @@ -374,17 +343,17 @@ |
374 | 343 | //儿童 |
375 | 344 | MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby(); |
376 | 345 | Map<String, String> as = new HashMap<>(); |
377 | - Integer pf1 = allFm.getBABY_APGAR_SCORE_ONE(); | |
378 | - Integer pf5 = allFm.getBABY_APGAR_SCORE_FIVE(); | |
379 | - Integer pf10 = allFm.getBABY_APGAR_SCORE_TEN(); | |
346 | + String pf1 = allFm.getSBABY_APGAR_SCORE_ONE(); | |
347 | + String pf5 = allFm.getSBABY_APGAR_SCORE_FIVE(); | |
348 | + String pf10 = allFm.getSBABY_APGAR_SCORE_TEN(); | |
380 | 349 | if(pf1!=null){ |
381 | - as.put("pf1", allFm.getBABY_APGAR_SCORE_ONE().toString()); | |
350 | + as.put("pf1", allFm.getSBABY_APGAR_SCORE_ONE()); | |
382 | 351 | } |
383 | 352 | if(pf5!=null){ |
384 | - as.put("pf5", allFm.getBABY_APGAR_SCORE_FIVE().toString()); | |
353 | + as.put("pf5", allFm.getSBABY_APGAR_SCORE_FIVE()); | |
385 | 354 | } |
386 | 355 | if(pf10!=null){ |
387 | - as.put("pf10", allFm.getBABY_APGAR_SCORE_TEN().toString()); | |
356 | + as.put("pf10", allFm.getSBABY_APGAR_SCORE_TEN()); | |
388 | 357 | } |
389 | 358 | |
390 | 359 |