diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyAutoDiagnoseRiskController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyAutoDiagnoseRiskController.java index c08ca64..707fccd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyAutoDiagnoseRiskController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyAutoDiagnoseRiskController.java @@ -80,7 +80,7 @@ public class BabyAutoDiagnoseRiskController extends BaseController { @TokenRequired public BaseResponse autoBabyInfoRisk(@RequestBody BabyAutoRiskInfoRequest babyAutoRiskInfoRequest, HttpServletRequest request) throws Exception{ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return autoDiagnoseRiskFacade.autoBabyInfoRisk(babyAutoRiskInfoRequest); + return autoDiagnoseRiskFacade.autoBabyInfoRisk(babyAutoRiskInfoRequest,loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java index 0f16b74..08e89a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java @@ -97,7 +97,7 @@ public class BabyAutoDiagnoseRiskFacade { List > riskList = autoRisk(babyAutoRiskRequest, babyAutoRiskRequest.getHospitalId(), type); autoBabyRiskRecord.setDiagnosis(riskList); List list = new ArrayList <>(); - getDiagnosisId(autoBabyRiskRecord,list); + getDiagnosisId(autoBabyRiskRecord, list); autoBabyRiskRecord.setDiagnosislist(list); @@ -112,9 +112,10 @@ public class BabyAutoDiagnoseRiskFacade { * @Author: 武涛涛 * @Date: 2020/9/3 20:54 */ - public BaseResponse autoBabyInfoRisk(BabyAutoRiskInfoRequest babyAutoRiskInfoRequest) throws NoSuchFieldException, IllegalAccessException { + public BaseResponse autoBabyInfoRisk(BabyAutoRiskInfoRequest babyAutoRiskInfoRequest, Integer userId) throws NoSuchFieldException, IllegalAccessException { BabyAutoRiskRequest babyAutoRiskRequest = babyAutoRiskInfoRequest.convertToDataModel(); - + String hospitalId = autoMatchFacade.getHospitalId(userId); + babyAutoRiskRequest.setHospitalId(hospitalId); //自动诊断高危 List > riskList = autoRisk(babyAutoRiskRequest, babyAutoRiskRequest.getHospitalId(), babyAutoRiskInfoRequest.getType()); @@ -394,7 +395,13 @@ public class BabyAutoDiagnoseRiskFacade { if (CollectionUtils.isNotEmpty(baby)) { MaternalDeliverModel.Baby baby1 = baby.get(0); if (baby1 != null) { + //配置是g,儿童建档和检查是kg String babyWeight = baby1.getBabyWeight(); + if ((type == 1 || type == 2) && StringUtils.isNotEmpty(baby1.getBabyWeight())) { + Double babyWe = Double.parseDouble(baby1.getBabyWeight()) * 1000; + babyWeight = babyWe.toString(); + } + List items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.tz.getId()); if (CollectionUtils.isNotEmpty(items) && StringUtils.isNotEmpty(babyWeight)) { for (DiagnoseItemModel item : items) { @@ -714,7 +721,7 @@ public class BabyAutoDiagnoseRiskFacade { //MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS); MongoCondition con5 = MongoCondition.newInstance("vcCardNo", antExManagerQueryRequest.getQueryNo(), MongoOper.IS); if (c1 != null) { - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con4,con5}).getCriteria()); + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5}).getCriteria()); query.addCriteria(c1); } else { c1 = c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5}).getCriteria(); @@ -772,7 +779,7 @@ public class BabyAutoDiagnoseRiskFacade { } } String risk = commonService.resloveFactor(stringLis); - map.put("risk", risk); + map.put("risk", risk);//诊断 if (model.getStatus() != null) { map.put("status", model.getStatus() == 0 ? "未确诊" : "已确诊"); } else { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java index 2c8f19c..8d533d8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java @@ -15,7 +15,7 @@ import org.apache.commons.lang.math.NumberUtils; public class AntExManagerQueryRequest extends BasePageQueryRequest { //姓名 private String name; - //证件号 + //证件号babyAutoDiagnoseRisk private String cardNo; //孕周 private String startDueWeek;