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 dbc49ca..de17432 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 @@ -429,7 +429,7 @@ public class AntenatalExaminationController extends BaseController { @ResponseBody public BaseResponse inputWxData( @RequestParam(value = "fuh", required = false) String fuh, - @RequestParam(value = "abdominalGirth") String abdominalGirth, + @RequestParam(value = "abdominalGirth", required = false) String abdominalGirth, @RequestParam(value = "fhr") String fhr, @RequestParam(value = "pid") String pid, @RequestParam(value = "hospitalId") String hospitalId, 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 80f8423..9162114 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 @@ -12,6 +12,7 @@ import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.AntExAddRequest; import com.lyms.platform.operate.web.request.AntExManagerQueryRequest; import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest; +import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.operate.web.result.AntExManagerResult; import com.lyms.platform.operate.web.result.CjStatisticsListResult; import com.lyms.platform.operate.web.result.CjStatisticsResult; @@ -891,19 +892,38 @@ public class AntExRecordFacade { } if (falg) { //创建一条复诊记录 - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId)), Patients.class); + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId).and("type").is(1)), Patients.class); if (null != patients) { AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(patients.getId())), AntExChuModel.class); if (null != antExChuModel) { AntExAddRequest antExAddRequest = new AntExAddRequest(); antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date())); - antExAddRequest.setCheckDate("1000000185"); + antExAddRequest.setCheckDoctor("1000000185"); antExAddRequest.setDiagnosisOther(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));// diagnosisOther: "29+4周妊娠 " antExAddRequest.setCurrentDueDate(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//currentDueDate: "孕29周+4天" - antExAddRequest.setGuide("个人卫生 受激素影响怀孕后肤质与孕前不一样，保养皮肤请做好日常清洁并避免使用刺激性的护肤品与保养品。\\r\\n心理调节 心理状态不佳更需家人陪伴与支持，可与丈夫一起上孕妇学校课程、或与丈夫携手散步、又或让丈夫给您进行甜蜜按摩。\\r\\n营养 虽然孕期体重增加过多会增加你的高血压和怀上巨大儿的可能性。但是也不要进入饮食的误区，靠节食来减缓体重增长的速度。正确的方法是，请医生给你一些均衡饮食的建议，使你能够达到孕期的标准体重。\\r\\n运动 骨盆底肌肉练习：从现在起，你可以开始做骨盆底肌肉练习了，这个运动可以帮助你分娩的更快、更容易。骨盆底肌肉练习的步骤是：收缩肛门、阴道，再放松。重复这个动作30次。\\r\\n其他 当宝贝活动较多的时候，可跟老公一起给宝贝读些优美的诗歌，享受一家人的幸福时光。\\r\\n"); + antExAddRequest.setGuide("个人卫生 受激素影响怀孕后肤质与孕前不一样，保养皮肤请做好日常清洁并避免使用刺激性的护肤品与保养品。" + + "心理调节 心理状态不佳更需家人陪伴与支持，可与丈夫一起上孕妇学校课程、或与丈夫携手散步、又或让丈夫给您进行甜蜜按摩。" + + "营养 虽然孕期体重增加过多会增加你的高血压和怀上巨大儿的可能性。但是也不要进入饮食的误区，靠节食来减缓体重增长的速度。" + + "正确的方法是，请医生给你一些均衡饮食的建议，使你能够达到孕期的标准体重。" + + "运动 骨盆底肌肉练习：从现在起，你可以开始做骨盆底肌肉练习了，这个运动可以帮助你分娩的更快、更容易。" + + "骨盆底肌肉练习的步骤是：收缩肛门、阴道，再放松。重复这个动作30次。" + + "其他 当宝贝活动较多的时候，可跟老公一起给宝贝读些优美的诗歌，享受一家人的幸福时光。"); antExAddRequest.setParentId(patients.getId()); antExAddRequest.setPid(pid); antExAddRequest.setRiskFactor(patients.getRiskFactorId()); + antExAddRequest.setGongGao(fuh); + antExAddRequest.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); + } + antExAddRequest.setTireData(placentaList); + antExAddRequest.setTireNumber(list.size() + ""); + } antenatalExaminationFacade.addOneAntEx(antExAddRequest, 1000000185); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index d9befc0..87247a7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -488,7 +488,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert