From f0bbc4d337f3ed531290b395325729a360fd40a2 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Tue, 9 Jan 2018 11:24:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B8=E5=9F=8E=E5=A6=87=E5=B9=BC=E5=88=86?= =?UTF-8?q?=E5=A8=A9=E6=8E=A5=E5=8F=A3=E6=B5=81=E7=A8=8B=E6=A2=B3=E7=90=86?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/hospitalapi/dzfy/Fm.java | 28 ++++++++++++ .../com/lyms/hospitalapi/llfy/LlfyFmService.java | 2 +- .../com/lyms/hospitalapi/zcfy/ZcfyFmService.java | 51 +++++----------------- 3 files changed, 39 insertions(+), 42 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java index 4271a04..622d514 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java @@ -77,6 +77,34 @@ public class Fm { private String ccThree; //用来接收乐陵第三产程中间转化字段 private String total; //用来接收乐陵总产程中间转换字段 + private String SBABY_APGAR_SCORE_ONE; //APGAR评分 1分钟 接收处理诸城评分有"转"值的数据 + private String SBABY_APGAR_SCORE_FIVE;//APGAR评分 5分钟 + private String SBABY_APGAR_SCORE_TEN; //APGAR评分 10分钟 + + public String getSBABY_APGAR_SCORE_ONE() { + return SBABY_APGAR_SCORE_ONE; + } + + public void setSBABY_APGAR_SCORE_ONE(String SBABY_APGAR_SCORE_ONE) { + this.SBABY_APGAR_SCORE_ONE = SBABY_APGAR_SCORE_ONE; + } + + public String getSBABY_APGAR_SCORE_FIVE() { + return SBABY_APGAR_SCORE_FIVE; + } + + public void setSBABY_APGAR_SCORE_FIVE(String SBABY_APGAR_SCORE_FIVE) { + this.SBABY_APGAR_SCORE_FIVE = SBABY_APGAR_SCORE_FIVE; + } + + public String getSBABY_APGAR_SCORE_TEN() { + return SBABY_APGAR_SCORE_TEN; + } + + public void setSBABY_APGAR_SCORE_TEN(String SBABY_APGAR_SCORE_TEN) { + this.SBABY_APGAR_SCORE_TEN = SBABY_APGAR_SCORE_TEN; + } + public String getSxl() { return sxl; } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java index ab45a6b..975977e 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java @@ -102,7 +102,7 @@ public class LlfyFmService { String startStr = fmt.format(start); String endStr = fmt.format(end); System.out.println("start=" + startStr + "end=" + endStr); - //queryFmPatient(startStr, endStr, null); + queryFmPatient(startStr, endStr, null); } public void syncByPhone(String startStr,String endStr,String phone) { diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcfyFmService.java index 7305aaa..520d447 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcfyFmService.java @@ -105,7 +105,7 @@ public class ZcfyFmService { String startStr = fmt.format(start); String endStr = fmt.format(end); System.out.println("start=" + startStr + "end=" + endStr); - //queryFmPatient(startStr, endStr, null); + queryFmPatient(startStr, endStr, null); } public void syncByPhone(String startStr,String endStr,String phone) { @@ -128,19 +128,13 @@ public class ZcfyFmService { " FETUS_NUM as FETUS_NUM,\n" + " to_number(BABY_WEIGHT) as BABY_WEIGHT,\n" + " to_number(BABY_HEIGHT) as BABY_HEIGHT,\n" + - " to_number(BABY_APGAR_SCORE_ONE) as BABY_APGAR_SCORE_ONE,\n" + - " to_number(BABY_APGAR_SCORE_FIVE) as BABY_APGAR_SCORE_FIVE,\n" + - " to_number(BABY_APGAR_SCORE_TEN) as BABY_APGAR_SCORE_TEN,\n" + + " BABY_APGAR_SCORE_ONE as SBABY_APGAR_SCORE_ONE,\n" + + " BABY_APGAR_SCORE_FIVE as SBABY_APGAR_SCORE_FIVE,\n" + + " BABY_APGAR_SCORE_TEN as SBABY_APGAR_SCORE_TEN,\n" + " BABY_PREGNANCY_OUT as BABY_PREGNANCY_OUT,\n" + " DELIVERY_MODE as DELIVERY_MODE,\n" + " MATERNAL_INFO as MATERNAL_INFO,\n" + " PERINEAL_CONDITION as PERINEAL_CONDITION,\n" + - //" DELIVER_DOCTOR as DELIVER_DOCTOR,\n" + - //" PROD_PROCESS_ONE as PROD_PROCESS_ONE,\n" + - // " 第二期 as PROD_PROCESS_TWO,\n" + - // " 第三期 as PROD_PROCESS_THREE,\n" + - //" 总计 as TOTAL_PROCESS,\n" + - //" CONVERT(int,胎盘数量) as PLACENTA_NUM,\n" + " DELIVER_HOSPITAL as DELIVER_HOSPITAL,\n" + " ADDR as ADDR,\n"+ " DELIVER_DOCTOR as DELIVER_DOCTOR"; @@ -209,31 +203,6 @@ public class ZcfyFmService { continue; } - //将中间字段的值整理赋值到正式字段中 - /*int sxl = allFm.getSxl().length(); - allFm.setSH_LOSE_BLOOD(Integer.parseInt(allFm.getSxl().substring(0,sxl-2)));//失血量 - - String[] oneShi = allFm.getCcOne().split("时"); - int one = Integer.parseInt(oneShi[0])*60; - String[] oneFen = oneShi[1].split("分"); - allFm.setPROD_PROCESS_ONE(one+Integer.parseInt(oneFen[0]));//第一产程 - - String[] twoShi = allFm.getCcTwo().split("时"); - int two = Integer.parseInt(twoShi[0])*60; - String[] twoFen = twoShi[1].split("分"); - allFm.setPROD_PROCESS_TWO(two+Integer.parseInt(twoFen[0]));//第二产程 - - String[] threeShi = allFm.getCcThree().split("时"); - int three = Integer.parseInt(threeShi[0])*60; - String[] threeFen = threeShi[1].split("分"); - allFm.setPROD_PROCESS_THREE(three+Integer.parseInt(threeFen[0]));//第三产程 - - String[] totalShi = allFm.getTotal().split("时"); - int total = Integer.parseInt(totalShi[0])*60; - String[] totalFen = totalShi[1].split("分"); - allFm.setTOTAL_PROCESS(String.valueOf(total+Integer.parseInt(totalFen[0])));//总产程 -*/ - PatientsQuery query = new PatientsQuery(); query.setYn(YnEnums.YES.getId()); query.setType(1); //孕妇 @@ -374,17 +343,17 @@ public class ZcfyFmService { //儿童 MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby(); Map as = new HashMap<>(); - Integer pf1 = allFm.getBABY_APGAR_SCORE_ONE(); - Integer pf5 = allFm.getBABY_APGAR_SCORE_FIVE(); - Integer pf10 = allFm.getBABY_APGAR_SCORE_TEN(); + String pf1 = allFm.getSBABY_APGAR_SCORE_ONE(); + String pf5 = allFm.getSBABY_APGAR_SCORE_FIVE(); + String pf10 = allFm.getSBABY_APGAR_SCORE_TEN(); if(pf1!=null){ - as.put("pf1", allFm.getBABY_APGAR_SCORE_ONE().toString()); + as.put("pf1", allFm.getSBABY_APGAR_SCORE_ONE()); } if(pf5!=null){ - as.put("pf5", allFm.getBABY_APGAR_SCORE_FIVE().toString()); + as.put("pf5", allFm.getSBABY_APGAR_SCORE_FIVE()); } if(pf10!=null){ - as.put("pf10", allFm.getBABY_APGAR_SCORE_TEN().toString()); + as.put("pf10", allFm.getSBABY_APGAR_SCORE_TEN()); } -- 1.8.3.1