From 9d38ecd3eb504d6eee3c3f38a54dd976eaff12f7 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 22 Jun 2018 16:00:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/SieveController.java | 3 +- .../platform/operate/web/facade/SieveFacade.java | 239 +++++++++++++-------- .../operate/web/request/SieveAddRequest.java | 2 +- .../web/service/impl/PatientWeightServiceImpl.java | 4 +- 4 files changed, 158 insertions(+), 90 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index 283a839..cf83a52 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -89,11 +89,10 @@ public class SieveController extends BaseController { return sieveFacade.querySievePatientInfo(cardNo, vcCardNo, loginState.getId()); } - /** * 查看申请单 * - * type 1 查看 2 修改 3 结果看 + * type 1 查看 2 产筛申请修改 3 结果看 4，产筛结果修改查询 * @param parentId * @param request * @return diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 30ebd64..7f6f397 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -651,107 +651,176 @@ public class SieveFacade { - List sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); - if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) + if (type == 4) { - Map result = new HashMap<>(); - - Map viewInfo = new HashMap<>(); - SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); - - result.put("id",sieveApply.getId()); - result.put("parentId",sieveApply.getParentId()); - - result.put("check",sieveApply.getCheckItem()); - result.put("guide",sieveApply.getGuide()); - result.put("checkDate",sieveApply.getCheckDate()); - result.put("applyDoctor",sieveApply.getApplyDoctor()); - result.put("hospitalId",sieveApply.getHospitalId()); - result.put("applyTime",DateUtil.getyyyy_MM_dd(sieveApply.getApplyTime())); - result.put("birth",DateUtil.getyyyy_MM_dd(sieveApply.getBirth())); - result.put("weight",sieveApply.getWeight()); - result.put("lastMenses",DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses())); - result.put("number",sieveApply.getNumber()); - result.put("collectionDoctorId",sieveApply.getCollectionDoctorId()); - result.put("collectionDate",DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate())); - result.put("crl",sieveApply.getCrl()); - result.put("bpd",sieveApply.getBpd()); - result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate())); - result.put("historyBirth",sieveApply.getHistoryBirth()); - result.put("pastHistory",sieveApply.getPastHistory()); - result.put("applyHospitalId",sieveApply.getApplyHospitalId()); - result.put("sendDoctor",sieveApply.getSendDoctor()); - result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime())); - result.put("age",DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated())); - result.put("mensesDay",sieveApply.getMensesDay()); - result.put("mensesWeek",sieveApply.getMensesWeek()); - result.put("experimentNum",""); - - map.put("sieveApplyInfo",result); - - if (type == 1 || type == 3) + + Map sieveResultEditInfo = new HashMap<>(); + SieveResultQuery sieveResultQuery = new SieveResultQuery(); + sieveResultQuery.setParentId(parentId); + sieveResultQuery.setYn(YnEnums.YES.getId()); + List list = sieveService.queryListSieveResult(sieveResultQuery); + if (CollectionUtils.isNotEmpty(list)) + { + SieveResultModel model = list.get(0); + sieveResultEditInfo.put("hcg",model.gethCg() != null ? model.gethCg() : ""); + sieveResultEditInfo.put("hcgMom",model.gethCgMom() != null ? model.gethCgMom() : ""); + sieveResultEditInfo.put("hafp",model.getHafp() != null ? model.getHafp() : ""); + sieveResultEditInfo.put("hafpMom",model.getHafpMom() != null ? model.getHafpMom() : ""); + sieveResultEditInfo.put("examineId", model.getExamineId()); + sieveResultEditInfo.put("checkerId",model.getCheckerId()); + sieveResultEditInfo.put("reportTime",DateUtil.getyyyy_MM_dd(model.getResultTime())); + + sieveResultEditInfo.put("tszh",model.getTszhz()); + sieveResultEditInfo.put("sbst",model.getSbst()); + sieveResultEditInfo.put("stzhz13",model.getStzhz13()); + sieveResultEditInfo.put("sjgjx",model.getSjgjx()); + } + map.put("sieveResultEditInfo",sieveResultEditInfo); + } + else + { + List sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { - String applyDoctorName = CommonsHelper.getUserName(sieveApply.getApplyDoctor(),usersService); - viewInfo.put("applyDoctorName",applyDoctorName); + Map result = new HashMap<>(); + + Map viewInfo = new HashMap<>(); + SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); + + result.put("id",sieveApply.getId()); + result.put("parentId",sieveApply.getParentId()); + + result.put("check",sieveApply.getCheckItem()); + result.put("guide",sieveApply.getGuide()); + result.put("checkDate",sieveApply.getCheckDate()); + result.put("applyDoctor",sieveApply.getApplyDoctor()); + result.put("hospitalId",sieveApply.getHospitalId()); + result.put("applyTime",DateUtil.getyyyy_MM_dd(sieveApply.getApplyTime())); + result.put("birth",DateUtil.getyyyy_MM_dd(sieveApply.getBirth())); + result.put("weight",sieveApply.getWeight()); + result.put("lastMenses",DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses())); + result.put("number",sieveApply.getNumber()); + result.put("collectionDoctorId",sieveApply.getCollectionDoctorId()); + result.put("collectionDate",DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate())); + result.put("crl",sieveApply.getCrl()); + result.put("bpd",sieveApply.getBpd()); + result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate())); + result.put("historyBirth",sieveApply.getHistoryBirth()); + result.put("pastHistory",sieveApply.getPastHistory()); + result.put("applyHospitalId",sieveApply.getApplyHospitalId()); + result.put("sendDoctor",sieveApply.getSendDoctor()); + result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime())); + result.put("age",DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated())); + result.put("mensesDay",sieveApply.getMensesDay()); + result.put("mensesWeek",sieveApply.getMensesWeek()); + result.put("experimentNum",""); + + map.put("sieveApplyInfo",result); + + if (type == 1 || type == 3) + { + String applyDoctorName = CommonsHelper.getUserName(sieveApply.getApplyDoctor(),usersService); + viewInfo.put("applyDoctorName",applyDoctorName); - String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(),usersService); - viewInfo.put("collectionDoctorName",collectionDoctorName); + String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(),usersService); + viewInfo.put("collectionDoctorName",collectionDoctorName); - String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(),usersService); - viewInfo.put("sendDoctorName",sendDoctorName); + String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(),usersService); + viewInfo.put("sendDoctorName",sendDoctorName); - String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getApplyHospitalId(),organizationService); - viewInfo.put("applyHospitalName", applyHospitalName); + String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getApplyHospitalId(),organizationService); + viewInfo.put("applyHospitalName", applyHospitalName); - String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(),organizationService); - viewInfo.put("currentHospitalName", currentHospitalName); + String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(),organizationService); + viewInfo.put("currentHospitalName", currentHospitalName); - String isTire = ""; - String tireNumber = ""; - AntExChuQuery antExChuQuery1 = new AntExChuQuery(); - antExChuQuery1.setParentId(parentId); - antExChuQuery1.setYn(YnEnums.YES.getId()); - List data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1); - if (CollectionUtils.isNotEmpty(data1)) - { - AntExChuModel chuModel = data1.get(0); - if (StringUtils.isNotEmpty(chuModel.getTireNumber())) + String isTire = ""; + String tireNumber = ""; + AntExChuQuery antExChuQuery1 = new AntExChuQuery(); + antExChuQuery1.setParentId(parentId); + antExChuQuery1.setYn(YnEnums.YES.getId()); + List data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1); + if (CollectionUtils.isNotEmpty(data1)) { - isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是":"否"; - tireNumber = chuModel.getTireNumber(); + AntExChuModel chuModel = data1.get(0); + if (StringUtils.isNotEmpty(chuModel.getTireNumber())) + { + isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是":"否"; + tireNumber = chuModel.getTireNumber(); + } } - } - map.put("isTire", isTire); - map.put("tireNumber",tireNumber); - map.put("viewInfo",viewInfo); + map.put("isTire", isTire); + map.put("tireNumber",tireNumber); + map.put("viewInfo",viewInfo); - if (type == 3) - { - Map sieveResultInfo = new HashMap<>(); - - SieveResultQuery sieveResultQuery = new SieveResultQuery(); - sieveResultQuery.setParentId(parentId); - sieveResultQuery.setYn(YnEnums.YES.getId()); - List list = sieveService.queryListSieveResult(sieveResultQuery); - if (CollectionUtils.isNotEmpty(list)) + if (type == 3) { - SieveResultModel sieveResultModel = list.get(0); - sieveResultInfo.put("hcg",sieveResultModel.gethCg() != null ? sieveResultModel.gethCg()+"ng/ml" : ""); - sieveResultInfo.put("hcgMom",sieveResultModel.gethCgMom() != null ? sieveResultModel.gethCgMom() : ""); - sieveResultInfo.put("hafp",sieveResultModel.getHafp() != null ? sieveResultModel.getHafp()+"U/ml" : ""); - sieveResultInfo.put("hafpMom",sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : ""); - sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(),usersService)); - sieveResultInfo.put("checkerName",CommonsHelper.getUserName(sieveResultModel.getCheckerId(),usersService)); - sieveResultInfo.put("reportTime",DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime())); + Map sieveResultInfo = new HashMap<>(); + + SieveResultQuery sieveResultQuery = new SieveResultQuery(); + sieveResultQuery.setParentId(parentId); + sieveResultQuery.setYn(YnEnums.YES.getId()); + List list = sieveService.queryListSieveResult(sieveResultQuery); + if (CollectionUtils.isNotEmpty(list)) + { + SieveResultModel sieveResultModel = list.get(0); + sieveResultInfo.put("hcg",sieveResultModel.gethCg() != null ? sieveResultModel.gethCg()+"ng/ml" : ""); + sieveResultInfo.put("hcgMom",sieveResultModel.gethCgMom() != null ? sieveResultModel.gethCgMom() : ""); + sieveResultInfo.put("hafp",sieveResultModel.getHafp() != null ? sieveResultModel.getHafp()+"U/ml" : ""); + sieveResultInfo.put("hafpMom",sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : ""); + sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(), usersService)); + sieveResultInfo.put("checkerName",CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService)); + sieveResultInfo.put("reportTime",DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime())); + + String tszhzValue = ""; + if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) + { + + String valueOne = sieveResultModel.getTszhzValue().get("valueOne"); + String valueTwo = sieveResultModel.getTszhzValue().get("valueTwo"); + tszhzValue = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getTszhz()) ? "低风险" : "1".equals(sieveResultModel.getTszhz()) ? "临界值" : "高风险"); + } + sieveResultInfo.put("tszhz",tszhzValue); + + + String sbst = ""; + if (StringUtils.isNotEmpty(sieveResultModel.getSbst()) && sieveResultModel.getSbstValue() != null && sieveResultModel.getSbstValue().size() > 0) + { + + String valueOne = sieveResultModel.getSbstValue().get("valueOne"); + String valueTwo = sieveResultModel.getSbstValue().get("valueTwo"); + sbst = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getSbst()) ? "低风险" : "1".equals(sieveResultModel.getSbst()) ? "临界值" : "高风险"); + } + sieveResultInfo.put("sbst",sbst); + + + String sjgjx = ""; + if (StringUtils.isNotEmpty(sieveResultModel.getSjgjx()) && sieveResultModel.getSjgjxValue() != null && sieveResultModel.getSjgjxValue().size() > 0) + { + + String valueOne = sieveResultModel.getSjgjxValue().get("valueOne"); + String valueTwo = sieveResultModel.getSjgjxValue().get("valueTwo"); + sjgjx = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getSjgjx()) ? "低风险" : "1".equals(sieveResultModel.getSjgjx()) ? "临界值" : "高风险"); + } + sieveResultInfo.put("sjgjx",sjgjx); + + String stzhz13 = ""; + if (StringUtils.isNotEmpty(sieveResultModel.getStzhz13()) && sieveResultModel.getStzhz13Value() != null && sieveResultModel.getStzhz13Value().size() > 0) + { + String valueOne = sieveResultModel.getStzhz13Value().get("valueOne"); + String valueTwo = sieveResultModel.getStzhz13Value().get("valueTwo"); + stzhz13 = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getStzhz13()) ? "低风险" : "1".equals(sieveResultModel.getStzhz13()) ? "临界值" : "高风险"); + } + sieveResultInfo.put("stzhz13",stzhz13); - } - map.put("sieveResultInfo",sieveResultInfo); + } + map.put("sieveResultInfo",sieveResultInfo); + } } } - - } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java index 4a92b2c..825e20e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java @@ -244,7 +244,7 @@ public class SieveAddRequest implements IBasicRequestConvert { sieveModel.sethCg(hCg); sieveModel.sethCgMom(hCgMom); sieveModel.setHafp(hafp); - sieveModel.sethCgMom(hafpMom); + sieveModel.setHafpMom(hafpMom); sieveModel.setExamineId(examineId); sieveModel.setCheckerId(checkerId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index bdb7dff..37cfaab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1497,8 +1497,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient public static void main(String[] args) { PatientWeightServiceImpl patientWeightService = new PatientWeightServiceImpl(); - String bmi = patientWeightService.getBmi("50", "170"); - Map map = patientWeightService.getComputeKul(50 , 59.05, 27, Double.parseDouble(bmi),"2"); + String bmi = patientWeightService.getBmi("68.07", "165"); + Map map = patientWeightService.getComputeKul(50 , 70.43, 18, Double.parseDouble(bmi),"2"); System.out.println(map); } } -- 1.8.3.1