Commit 6d4314c9e9a97e99e079f5ab4163587dcec68538
1 parent
9b09544c1a
Exists in
master
and in
6 other branches
出院
Showing 2 changed files with 22 additions and 12 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
6d4314c
| ... | ... | @@ -5221,6 +5221,16 @@ |
| 5221 | 5221 | return "success"; |
| 5222 | 5222 | } |
| 5223 | 5223 | |
| 5224 | + @RequestMapping(value = "/lpfy/getFmData", method = RequestMethod.GET) | |
| 5225 | + @ResponseBody | |
| 5226 | + public String getFmData(@RequestParam(required = false)String cardNo) { | |
| 5227 | + | |
| 5228 | + Map<String,String> data = new HashMap(); | |
| 5229 | + data.put("130824199802011022","{\"code\":0,\"message\":\"成功\",\"data\":{\"due_week\":\"39\",\"due_day\":\"3\",\"fetus_num\":null,\"placenta_num\":\"1\",\"bhnum\":\"227347\",\"maternal_info\":null,\"chbp\":null,\"ch2bp\":null,\"breath\":null,\"pulse\":null,\"oh_lose_blood\":null,\"th_lose_blood\":null,\"rh_lose_blood\":null,\"sh_lose_blood\":null,\"lose_blood_cause\":null,\"babyList\":[{\"delivery_mode\":\"1\",\"operation_cause\":null,\"prod_process_one\":\"0\",\"prod_process_two\":\"0\",\"prod_process_three\":\"0\",\"total_process\":null,\"perineal_condition\":\"split\",\"silie_level\":\"1\",\"needle_num\":\"0\",\"tmctype\":\"1\",\"tmcside\":null,\"tlong\":null,\"twidth\":null,\"theight\":null,\"tweight\":null,\"um_length\":null,\"um_extype\":null,\"baby_fetal_presentation\":null,\"baby_fetal_position\":\"LOA\",\"baby_sex\":\"1\",\"baby_delivery_time\":\"2022-06-23 10:18:00\",\"baby_pregnancy_out\":\"0\",\"baby_weight\":\"3780\",\"baby_height\":\"54\",\"baby_deformity\":null,\"baby_apgar_score_one\":\"10\",\"baby_apgar_score_five\":\"10\",\"baby_apgar_score_ten\":\"10\",\"baby_asphyxiam\":null,\"baby_sick\":null,\"baby_touch_startm\":null,\"baby_touch_lastm\":null,\"baby_earlysuck\":null}]}}"); | |
| 5230 | + data.put("230183200004020240","{\"code\":0,\"message\":\"成功\",\"data\":{\"due_week\":\"40\",\"due_day\":\"5\",\"fetus_num\":null,\"placenta_num\":\"1\",\"bhnum\":\"227630\",\"maternal_info\":null,\"chbp\":null,\"ch2bp\":null,\"breath\":null,\"pulse\":null,\"oh_lose_blood\":null,\"th_lose_blood\":null,\"rh_lose_blood\":null,\"sh_lose_blood\":null,\"lose_blood_cause\":null,\"babyList\":[{\"delivery_mode\":\"1\",\"operation_cause\":null,\"prod_process_one\":\"0\",\"prod_process_two\":\"0\",\"prod_process_three\":\"0\",\"total_process\":null,\"perineal_condition\":\"split\",\"silie_level\":\"0\",\"needle_num\":\"0\",\"tmctype\":\"1\",\"tmcside\":null,\"tlong\":null,\"twidth\":null,\"theight\":null,\"tweight\":null,\"um_length\":null,\"um_extype\":null,\"baby_fetal_presentation\":null,\"baby_fetal_position\":\"正枕前\",\"baby_sex\":\"0\",\"baby_delivery_time\":\"2022-06-21 23:58:40\",\"baby_pregnancy_out\":\"0\",\"baby_weight\":\"3100\",\"baby_height\":\"50\",\"baby_deformity\":null,\"baby_apgar_score_one\":\"10\",\"baby_apgar_score_five\":\"10\",\"baby_apgar_score_ten\":\"10\",\"baby_asphyxiam\":null,\"baby_sick\":null,\"baby_touch_startm\":null,\"baby_touch_lastm\":null,\"baby_earlysuck\":null}]}}"); | |
| 5231 | + return data.get(cardNo); | |
| 5232 | + } | |
| 5233 | + | |
| 5224 | 5234 | |
| 5225 | 5235 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
6d4314c
| ... | ... | @@ -1238,9 +1238,9 @@ |
| 1238 | 1238 | babyModel.setSex(Integer.valueOf(baby1.getBabyGender())); |
| 1239 | 1239 | } |
| 1240 | 1240 | babyModel.setBuildDate(new Date()); |
| 1241 | - if ("216".equals(deliverAddRequest.getFmHospital())){//秦皇岛需求2021-10-16 15:05:58 | |
| 1242 | - babyModel.setBuildDate(DateUtil.parseYMD(maternalDeliverModel.getDueDate())); | |
| 1243 | - } | |
| 1241 | +// if ("216".equals(deliverAddRequest.getFmHospital())){//秦皇岛需求2021-10-16 15:05:58 | |
| 1242 | +// babyModel.setBuildDate(DateUtil.parseYMD(maternalDeliverModel.getDueDate())); | |
| 1243 | +// } | |
| 1244 | 1244 | babyModel.setApgarScore(baby1.getApgarScore()); |
| 1245 | 1245 | babyModel.setModified(new Date()); |
| 1246 | 1246 | babyModel.setBabyHealthy(baby1.getBabyHealthy()); |
| 1247 | 1247 | |
| ... | ... | @@ -1343,18 +1343,18 @@ |
| 1343 | 1343 | if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { |
| 1344 | 1344 | //babyModel.setYn(YnEnums.YES.getId()); |
| 1345 | 1345 | |
| 1346 | - | |
| 1347 | - if ("216".equals(deliverAddRequest.getFmHospital())){ | |
| 1348 | - //20211014 秦皇岛又改来直接建档 | |
| 1349 | - babyModel.setYn(YnEnums.YES.getId()); | |
| 1350 | - babyModel.setDataStatus(0); | |
| 1351 | - } | |
| 1352 | - else | |
| 1353 | - { | |
| 1346 | + //20220907分娩不直接建档儿童了秦皇岛妇幼 | |
| 1347 | +// if ("216".equals(deliverAddRequest.getFmHospital())){ | |
| 1348 | +// //20211014 秦皇岛又改来直接建档 | |
| 1349 | +// babyModel.setYn(YnEnums.YES.getId()); | |
| 1350 | +// babyModel.setDataStatus(0); | |
| 1351 | +// } | |
| 1352 | +// else | |
| 1353 | +// { | |
| 1354 | 1354 | //改成这种是因为需求要求 分娩自动流转儿童信息，建档时间为空，医生确认建档 |
| 1355 | 1355 | babyModel.setYn(YnEnums.NO.getId()); |
| 1356 | 1356 | babyModel.setDataStatus(1); |
| 1357 | - } | |
| 1357 | +// } | |
| 1358 | 1358 | |
| 1359 | 1359 | // PersonModel personModel = new PersonModel(); |
| 1360 | 1360 | // personModel.setType(2); |