diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/WxMeasureInfoModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/WxMeasureInfoModel.java index 2ebb464..2825a68 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/WxMeasureInfoModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/WxMeasureInfoModel.java @@ -10,7 +10,6 @@ import java.util.List; import java.util.Map; /** - * * @Author dongqin * @Description 小程序孕妇宫高、腹围等/儿保一般测量信息录入 * @Date 14:34 2019/5/30 @@ -51,6 +50,16 @@ public class WxMeasureInfoModel extends BaseModel { private List yumInfos; + private String doctorId; + + public String getDoctorId() { + return doctorId; + } + + public void setDoctorId(String doctorId) { + this.doctorId = doctorId; + } + public String getPid() { return pid; } 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 de17432..5d30630 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 @@ -433,8 +433,9 @@ public class AntenatalExaminationController extends BaseController { @RequestParam(value = "fhr") String fhr, @RequestParam(value = "pid") String pid, @RequestParam(value = "hospitalId") String hospitalId, - @RequestParam(value = "nextTime") String nextTime) { - return antExRecordFacade.inputWxData(fuh, abdominalGirth, fhr, pid, hospitalId, nextTime); + @RequestParam(value = "nextTime") String nextTime, + @RequestParam(value = "doctorId") String doctorId) { + return antExRecordFacade.inputWxData(fuh, abdominalGirth, fhr, pid, hospitalId, nextTime, doctorId); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 8ed8a3d..29641f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -84,6 +84,9 @@ public class AntExRecordFacade { @Autowired private ModularFunctionConfigService modularFunctionConfigServcie; + @Autowired + private AntenatalExaminationService antenatalExaminationService; + public void syncAntRecordToList(String hospitalId) { recordService.syncAntRecordToList(hospitalId); } @@ -880,7 +883,7 @@ public class AntExRecordFacade { /** * 小程序产检录入 */ - public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr, String pid, String hospitalId, String nextTime) { + public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr, String pid, String hospitalId, String nextTime, String doctorId) { WxMeasureInfoModel wxMeasureInfo = new WxMeasureInfoModel(); boolean falg = true; String value = null; @@ -903,6 +906,20 @@ public class AntExRecordFacade { for (AntenatalExaminationModel model : examinationModel) { if (StringUtils.isNotEmpty(DateUtil.getyyyy_MM_dd(model.getCheckDate())) && DateUtil.getyyyy_MM_dd(new Date()).equals(DateUtil.getyyyy_MM_dd(model.getCheckDate()))) { + model.setGongGao(fuh); + model.setAbdominalCircumference(abdominalGirth); + List list = JsonUtil.jkstr2Obj(fhr, List.class); + if (CollectionUtils.isNotEmpty(list)) { + List placentaList = new ArrayList<>(); + for (String l : list) { + MatDeliverAddRequest.Placenta placenta = new MatDeliverAddRequest.Placenta(); + placenta.setHeartRate(Double.parseDouble(l)); + placentaList.add(placenta); + } + model.setTireData(placentaList); + model.setTireNumber(list.size() + ""); + } + antenatalExaminationService.updateOneAnt(model, model.getId()); falg = false; } } @@ -915,7 +932,7 @@ public class AntExRecordFacade { if (null != antExChuModel) { AntExAddRequest antExAddRequest = new AntExAddRequest(); antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date())); - antExAddRequest.setCheckDoctor("1000000185"); + antExAddRequest.setCheckDoctor(doctorId); antExAddRequest.setDiagnosisOther(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));// diagnosisOther: "29+4周妊娠 " antExAddRequest.setCurrentDueDate(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//currentDueDate: "孕29周+4天" antExAddRequest.setGuide("个人卫生 受激素影响怀孕后肤质与孕前不一样,保养皮肤请做好日常清洁并避免使用刺激性的护肤品与保养品。" + @@ -941,7 +958,7 @@ public class AntExRecordFacade { antExAddRequest.setTireData(placentaList); antExAddRequest.setTireNumber(list.size() + ""); } - antenatalExaminationFacade.addOneAntEx(antExAddRequest, 1000000185); + antenatalExaminationFacade.addOneAntEx(antExAddRequest, Integer.parseInt(doctorId)); } } } @@ -961,6 +978,7 @@ public class AntExRecordFacade { wxMeasureInfo.setCreateTime(new Date()); wxMeasureInfo.setPid(pid); wxMeasureInfo.setHospitalId(hospitalId); + wxMeasureInfo.setDoctorId(doctorId); this.updateNexCheckTime(pid, yumInfosMap.get("nextTime").toString()); mongoTemplate.insert(wxMeasureInfo); } else {