diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java index 76ba937..3091878 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java @@ -7,6 +7,7 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.enums.*; +import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.StringUtils; @@ -65,6 +66,7 @@ public class DzfyFmService { private static Map babyMap = new HashMap<>(); + private static final String HOSPITALID = PropertiesUtils.getPropertyValue("hospitalId"); static { ONE_ENUMS.put(0, "长"); ONE_ENUMS.put(1, "次"); @@ -231,32 +233,15 @@ public class DzfyFmService { List list = queryRunner.query(conn, sql, new BeanListHandler(Fm.class)); ExceptionUtils.catchException("size====" + list.size()); - /* List list = new ArrayList(); - Fm fm = new Fm(); - fm.setID("33299"); - fm.setBHNUM("201303046"); - fm.setVCCARDNO("123654"); - fm.setNAME("小香香"); - fm.setPHONE("18613211129"); - fm.setIDCARD("530103198705306240"); - fm.setADDR("山东省烟台市芝罘区就是"); - fm.setFETUS_NUM(1); - fm.setPLACENTA_NUM(1); - fm.setPROD_PROCESS_ONE(240); - fm.setPROD_PROCESS_TWO(30); - fm.setPROD_PROCESS_THREE(5); - fm.setTOTAL_PROCESS("550"); - fm.setDELIVER_HOSPITAL("德州市妇幼保健院"); - fm.setBABY_SEX("男"); - fm.setBABY_DELIVERY_TIME(fmt.parse("2017-9-11 13:53:00")); - fm.setBABY_APGAR_SCORE_ONE(10); - fm.setBABY_APGAR_SCORE_FIVE(10); - fm.setBABY_APGAR_SCORE_TEN(10); - list.add(fm);*/ + /*List list = new ArrayList(); + Fm fm1 = new Fm(); + fm1.setID("33299"); + list.add(fm1);*/ if(CollectionUtils.isNotEmpty(list)){ for(Fm fm:list){ + int a = 0;//用来判断是否建了儿童档案，如果建了儿童档案就不保存分娩记录 List users = new ArrayList(); String id = fm.getID();//获取所有的孕妇ID，方便孕妇产下双胞胎而用 String allSql = "select "+cloumns+" from zlhis.v_deliveryinfo where " + @@ -266,6 +251,29 @@ public class DzfyFmService { //查出这个ID对应孕妇在这个时间段的分娩记录 List allList = queryRunner.query(conn, allSql, new BeanListHandler(Fm.class)); + /*List allList = new ArrayList(); + Fm fm2 = new Fm(); + fm2.setID("33299"); + fm2.setBHNUM("201303046"); + fm2.setVCCARDNO("143243"); + fm2.setNAME("ces"); + fm2.setPHONE("10232134234"); + fm2.setIDCARD("411628198106018181"); + fm2.setADDR("河北省秦皇岛市海港区dz"); + fm2.setFETUS_NUM(1); + fm2.setPLACENTA_NUM(1); + fm2.setPROD_PROCESS_ONE(260); + fm2.setPROD_PROCESS_TWO(80); + fm2.setPROD_PROCESS_THREE(75); + fm2.setTOTAL_PROCESS("550"); + fm2.setDELIVER_HOSPITAL("德州市妇幼保健院"); + fm2.setBABY_SEX("女"); + fm2.setBABY_DELIVERY_TIME(fmt.parse("2017-9-15 12:00:00")); + fm2.setBABY_APGAR_SCORE_ONE(10); + fm2.setBABY_APGAR_SCORE_FIVE(10); + fm2.setBABY_APGAR_SCORE_TEN(10); + allList.add(fm2);*/ + Date dueDate = null; List babies = new ArrayList<>(); MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest(); @@ -276,7 +284,13 @@ public class DzfyFmService { continue; } + PatientsQuery query = new PatientsQuery(); + query.setYn(YnEnums.YES.getId()); + query.setType(1); //孕妇 + query.setDueStatus(0); //未终止妊娠 + String[] strs = new String[]{allFm.getPHONE(),allFm.getIDCARD()}; + query.setPc(strs); //查询该孕妇是否在孕产婴系统中建档 List patientses = patientsService.queryPatient(query); @@ -286,7 +300,7 @@ public class DzfyFmService { patient = patientses.get(0); UsersQuery usersQuery = new UsersQuery(); usersQuery.setYn(YnEnums.YES.getId()); - usersQuery.setOrgId(1000000114); + usersQuery.setOrgId(new Integer(Integer.parseInt(HOSPITALID))); usersQuery.setName("产房"); users = usersService.queryUsers(usersQuery); @@ -296,25 +310,36 @@ public class DzfyFmService { if(dateTime!=null){ if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(allFm.getBABY_DELIVERY_TIME().toString())) { continue; + }else{ + dueDate = dateTime; } }else{ continue; } - Map map = new HashMap<>(); + Map> map = new HashMap<>(); + Map map1 = new HashMap<>(); + Map map2 = new HashMap<>(); + Map map3 = new HashMap<>(); Map totalMap = new HashMap<>(); Integer prod_Process_One = allFm.getPROD_PROCESS_ONE(); Integer prod_Process_Two = allFm.getPROD_PROCESS_TWO(); Integer prod_Process_Three = allFm.getPROD_PROCESS_THREE(); if(prod_Process_One!=null){ - map.put("one",allFm.getPROD_PROCESS_ONE().toString()); + map1.put("h",String.valueOf(prod_Process_One.intValue()/60)); + map1.put("m",String.valueOf(prod_Process_One.intValue()%60)); + map.put("one", map1); } if(prod_Process_Two!=null){ - map.put("two",allFm.getPROD_PROCESS_TWO().toString()); + map2.put("h",String.valueOf(prod_Process_Two.intValue()/60)); + map2.put("m",String.valueOf(prod_Process_Two.intValue()%60)); + map.put("two",map2); } if(prod_Process_Three!=null){ - map.put("three",allFm.getPROD_PROCESS_THREE().toString()); + map3.put("h",String.valueOf(prod_Process_Three.intValue()/60)); + map3.put("m",String.valueOf(prod_Process_Three.intValue()%60)); + map.put("three",map3); } int hProcess = Integer.parseInt(allFm.getTOTAL_PROCESS())/60;//总产程小时数 @@ -438,7 +463,7 @@ public class DzfyFmService { } }else{ - + a=1; //德州服务器有分娩记录，但是在这边系统没有对应孕妇 取分娩信息建档儿童数据 String babyName = allFm.getNAME()+("男".equals(allFm.getBABY_SEX()) ? "之子" : "之女"); FmItem fmitem=new FmItem(); @@ -483,13 +508,16 @@ public class DzfyFmService { } - deliverAddRequest.setBabies(babies); - deliverAddRequest.setFmHospital("1000000114"); //设置为德州妇幼 - ExceptionUtils.catchException("deliverAddRequest===" + deliverAddRequest); - if(users!=null && users.size()>0){ - matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); + if(a==0){ + deliverAddRequest.setBabies(babies); + deliverAddRequest.setFmHospital(HOSPITALID); //设置为德州妇幼 + ExceptionUtils.catchException("deliverAddRequest===" + deliverAddRequest); + if(users!=null && users.size()>0){ + matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); + } } + } @@ -565,11 +593,11 @@ public class DzfyFmService { UsersQuery usersQuery = new UsersQuery(); usersQuery.setYn(YnEnums.YES.getId()); usersQuery.setName("产房"); - usersQuery.setOrgId(1000000114); + usersQuery.setOrgId(new Integer(Integer.parseInt(HOSPITALID))); List users = usersService.queryUsers(usersQuery); BabyBookbuildingAddRequest request = new BabyBookbuildingAddRequest(); - request.setHospitalId("1000000114"); + request.setHospitalId(HOSPITALID); request.setMommyName(fm.getNAME()); //母亲姓名 Date bir = patInfo.getBirth(); @@ -658,7 +686,7 @@ public class DzfyFmService { } request.setApgarScore(map); - request.setDeliverOrg("1000000114"); + request.setDeliverOrg(HOSPITALID); request.setBuildDoctor(users.get(0).getId() + ""); request.setBuildDate(DateUtil.getyyyy_MM_dd(dueDate)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 229677a..353fab1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -95,12 +95,12 @@ public class AntenatalExaminationController extends BaseController { - /*@RequestMapping(method = RequestMethod.GET, value = "/fm") + @RequestMapping(method = RequestMethod.GET, value = "/fm") @ResponseBody public String getFm(String start,String end,String syxh){ dzfyFmService.queryFmPatient(start,end,syxh); return "1"; - }*/ + } diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index 589b67c..5d47e91 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -5,6 +5,9 @@ center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/ #德州代金券地址 djq_url=http://127.0.0.1:9090/his/insertDzfyDjq +#各个医院ID 216：秦皇岛妇幼保健院；1000000114：德州妇幼 +hospitalId=1000000114 + #区域平台访问短信中心的token center_token=e0c56363-00d6-42ee-bbe0-23c553583062