From 6d4314c9e9a97e99e079f5ab4163587dcec68538 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 7 Sep 2022 17:06:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/TestController.java | 10 +++++++++ .../operate/web/facade/MatDeliverFacade.java | 24 +++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 09ba034..2a797a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -5221,5 +5221,15 @@ public class TestController extends BaseController { return "success"; } + @RequestMapping(value = "/lpfy/getFmData", method = RequestMethod.GET) + @ResponseBody + public String getFmData(@RequestParam(required = false)String cardNo) { + + Map data = new HashMap(); + 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}]}}"); + 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}]}}"); + return data.get(cardNo); + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 848a227..a885420 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1238,9 +1238,9 @@ public class MatDeliverFacade { babyModel.setSex(Integer.valueOf(baby1.getBabyGender())); } babyModel.setBuildDate(new Date()); - if ("216".equals(deliverAddRequest.getFmHospital())){//秦皇岛需求2021-10-16 15:05:58 - babyModel.setBuildDate(DateUtil.parseYMD(maternalDeliverModel.getDueDate())); - } +// if ("216".equals(deliverAddRequest.getFmHospital())){//秦皇岛需求2021-10-16 15:05:58 +// babyModel.setBuildDate(DateUtil.parseYMD(maternalDeliverModel.getDueDate())); +// } babyModel.setApgarScore(baby1.getApgarScore()); babyModel.setModified(new Date()); babyModel.setBabyHealthy(baby1.getBabyHealthy()); @@ -1343,18 +1343,18 @@ public class MatDeliverFacade { if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { //babyModel.setYn(YnEnums.YES.getId()); - - if ("216".equals(deliverAddRequest.getFmHospital())){ - //20211014 秦皇岛又改来直接建档 - babyModel.setYn(YnEnums.YES.getId()); - babyModel.setDataStatus(0); - } - else - { + //20220907分娩不直接建档儿童了秦皇岛妇幼 +// if ("216".equals(deliverAddRequest.getFmHospital())){ +// //20211014 秦皇岛又改来直接建档 +// babyModel.setYn(YnEnums.YES.getId()); +// babyModel.setDataStatus(0); +// } +// else +// { //改成这种是因为需求要求 分娩自动流转儿童信息，建档时间为空，医生确认建档 babyModel.setYn(YnEnums.NO.getId()); babyModel.setDataStatus(1); - } +// } // PersonModel personModel = new PersonModel(); // personModel.setType(2); -- 1.8.3.1