diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java index eaef623..54da598 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java @@ -17,12 +17,16 @@ public class CdGwInterface { public String saveRecord(Patients patient,String hosipitalId){ + + HealthRecord HealthRecord = new HealthRecord(); HealthRecord.setPersonInfoId(""); - HealthRecord.setName(""); + HealthRecord.setName(patient.getUsername()); HealthRecord.setPinYinStr("无"); HealthRecord.setIdNo(patient.getCardNo()); HealthRecord.setTelNo(patient.getPhone()); + HealthRecord.setBirthday(patient.getBirth()); + HealthRecord.setAddress(""); HealthRecord.setIsAppCreate("9"); diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java index c6b8a43..eccf4f1 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java @@ -32,6 +32,7 @@ public class LcdcfFmService { " PHONE as PHONE,\n" + " NAME as NAME,\n" + " IDCARD as IDCARD,\n" + + " ADDR as addr,\n"+ " CREATED as CREATED,\t\n" + " to_char(BABY_DELIVERY_TIME,'yyyy-mm-dd hh24:mi:ss') as BABY_DELIVERY_TIME,\n" + " BABY_SEX as BABY_SEX,\n" + @@ -75,7 +76,7 @@ public class LcdcfFmService { Map deliveryMode = new HashMap(); //分娩方式 for(Fm fm:list){ maternalDeliverResult.setParentId(fm.getID()); - maternalDeliverResult.setDueDate(fm.getBABY_DELIVERY_TIME()); + maternalDeliverResult.setDueDate(fm.getBABY_DELIVERY_TIME().substring(0,10)); maternalDeliverResult.setDueWeek(fm.getDUE_WEEK()); maternalDeliverResult.setTireNumber(fm.getFETUS_NUM()); maternalDeliverResult.setPlacenta(fm.getPLACENTA_NUM().toString()); @@ -117,10 +118,14 @@ public class LcdcfFmService { map.put("three",map3); } - int hProcess = Integer.parseInt(fm.getTOTAL_PROCESS())/60;//总产程小时数 - int mProcess = Integer.parseInt(fm.getTOTAL_PROCESS())%60;//总产程分钟数 - totalMap.put("h",String.valueOf(hProcess)); - totalMap.put("m", String.valueOf(mProcess)); + if(fm.getTOTAL_PROCESS()!=null){ + int hProcess = Integer.parseInt(fm.getTOTAL_PROCESS())/60;//总产程小时数 + int mProcess = Integer.parseInt(fm.getTOTAL_PROCESS())%60;//总产程分钟数 + totalMap.put("h",String.valueOf(hProcess)); + totalMap.put("m", String.valueOf(mProcess)); + } + + maternalDeliverResult.setProdprocess(map); maternalDeliverResult.setTotalprocess(totalMap); 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 860f403..4749d65 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 @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.controller; import com.alibaba.fastjson.JSON; import com.lyms.hospitalapi.Cdfy.CdfyHisService; import com.lyms.hospitalapi.dzfy.DzfyFmService; +import com.lyms.hospitalapi.lcdcf.LcdcfFmService; import com.lyms.hospitalapi.qhdfy.QhdfyFmService; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.platform.biz.JdbcUtil; @@ -20,6 +21,7 @@ import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.facade.*; import com.lyms.platform.operate.web.request.AntExListQueryRequest; import com.lyms.platform.operate.web.result.HighScoreResult; +import com.lyms.platform.operate.web.result.MaternalDeliverResult; import com.lyms.platform.operate.web.service.IBloodPressureService; import com.lyms.platform.operate.web.service.SyncDataTaskService; import com.lyms.platform.operate.web.worker.AntexOtherHighRiskWorker; @@ -136,6 +138,9 @@ public class TestController extends BaseController { @Autowired private CdfyHisService cdfyHisService; + @Autowired + private com.lyms.hospitalapi.lcdcf.LcdcfFmService LcdcfFmService; + static Map highRisks = new HashMap<>(); @@ -1687,6 +1692,16 @@ public class TestController extends BaseController { return cdfyHisService.getIdByVcCardNo(code); } + @RequestMapping("/testLc") + @ResponseBody + public MaternalDeliverResult testLc(String bhnum){ + + return LcdcfFmService.queryFmPatient(bhnum); + } + + + + @RequestMapping(value = "/handleSieveTime", method = RequestMethod.GET) @ResponseBody public String doSieveTime(@RequestParam(required = false) String hospitalId,