diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java index ff94816..681cf2a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java @@ -2,12 +2,9 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; -import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.StringUtils; -import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.permission.model.CheckItemManage; @@ -19,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Date; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index f5e8a28..9a9868e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -317,8 +317,7 @@ public class AntenatalExaminationFacade { model.setHospitalId(hospitalId); //补录就不验证是否同一天复诊 - if (!StringUtils.isNotEmpty(antExAddRequest.getSupplement())) - { + if (!StringUtils.isNotEmpty(antExAddRequest.getSupplement())) { AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setParentId(antExAddRequest.getParentId()); @@ -358,7 +357,7 @@ public class AntenatalExaminationFacade { * @param antExamModel * @param hospitalId */ - public void updateAutoData(final AntenatalExaminationModel antExamModel,final AntExAddRequest antExAddRequest, final String hospitalId) { + public void updateAutoData(final AntenatalExaminationModel antExamModel, final AntExAddRequest antExAddRequest, final String hospitalId) { commonThreadPool.execute(new Runnable() { @Override public void run() { @@ -686,18 +685,17 @@ public class AntenatalExaminationFacade { } //处理数据自动流转 - updateChuAutoData(antExChuModel,excAddRequest, hospitalId, userId); + updateChuAutoData(antExChuModel, excAddRequest, hospitalId, userId); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } /** - * - * @param hospitalId 院内系统的医院id + * @param hospitalId 院内系统的医院id * @param patientId * @param doctorId */ - public void createdSengMsg1(String hospitalId,String patientId,String doctorId){ + public void createdSengMsg1(String hospitalId, String patientId, String doctorId) { Patients patient = patientsService.findOnePatientById(patientId); //判断医院是否启动和对应的服务项是否启用 SmsConfigModel configModel = new SmsConfigModel(); @@ -733,11 +731,10 @@ public class AntenatalExaminationFacade { Integer serviceType = 0; Integer serviceStatus = 0; - if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceStatusEnums.NO_OPEN.getId() - && patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())) - { - serviceType = ServiceTypeEnums.ALL_SERVICE.getId(); - serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId(); + if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceStatusEnums.NO_OPEN.getId() + && patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())) { + serviceType = ServiceTypeEnums.ALL_SERVICE.getId(); + serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId(); } //根据服务状态和服务类型获取可以发送的模板 @@ -860,11 +857,10 @@ public class AntenatalExaminationFacade { Integer serviceType = 0; Integer serviceStatus = 0; - if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceStatusEnums.NO_OPEN.getId() - && patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())) - { + if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceStatusEnums.NO_OPEN.getId() + && patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())) { serviceType = ServiceTypeEnums.ALL_SERVICE.getId(); - serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId(); + serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId(); } //根据服务状态和服务类型获取可以发送的模板 @@ -951,7 +947,7 @@ public class AntenatalExaminationFacade { * @param excAddRequest * @param hospitalId */ - public void updateChuAutoData(final AntExChuModel antExChuModel ,final AntExcAddRequest excAddRequest, final String hospitalId, final Integer userId) { + public void updateChuAutoData(final AntExChuModel antExChuModel, final AntExcAddRequest excAddRequest, final String hospitalId, final Integer userId) { commonThreadPool.execute(new Runnable() { @Override public void run() { @@ -1855,7 +1851,7 @@ public class AntenatalExaminationFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setSource(patients.getId()); patientsQuery.setBuildType(1); - System.out.println("查询条件："+patientsQuery.convertToQuery().convertToMongoQuery()); + System.out.println("查询条件：" + patientsQuery.convertToQuery().convertToMongoQuery()); List patients1 = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(patients1)) { for (Patients ps : patients1) { @@ -1897,7 +1893,7 @@ public class AntenatalExaminationFacade { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setYn(YnEnums.YES.getId()); - matDeliverQuery.setParentIdList(patientIds); + matDeliverQuery.setParentIdList(patientIds); List l = matDeliverService.query(matDeliverQuery); if (CollectionUtils.isNotEmpty(l)) { MaternalDeliverModel model = l.get(0); @@ -2134,7 +2130,6 @@ public class AntenatalExaminationFacade { } - public class SortIn { public SortIn(Patients patients) { @@ -2514,8 +2509,8 @@ public class AntenatalExaminationFacade { * @param type 类型 1 孕妇 3 产妇 -1 不区分 * @param outHospital 是否需要查外院 */ - public Patients findOnePatient(String cardNo, String vcCardNo,List hospitalIds, Integer - type, boolean outHospital, boolean isEnable,String hospitalId) { + public Patients findOnePatient(String cardNo, String vcCardNo, List hospitalIds, Integer + type, boolean outHospital, boolean isEnable, String hospitalId) { PatientsQuery patientsQuery = new PatientsQuery(); if (StringUtils.isNotEmpty(cardNo)) { patientsQuery.setCardNo(cardNo); @@ -2540,18 +2535,17 @@ public class AntenatalExaminationFacade { Patients patients = null; List list = patientsService.queryPatient1(patientsQuery, "modified"); if (CollectionUtils.isNotEmpty(list)) { - if(list.size()==1){ + if (list.size() == 1) { return list.get(0); - }else{ + } else { Patients mainPatient = null; - for(Patients ps:list){ - if (StringUtils.isEmpty(ps.getSource())) - { + for (Patients ps : list) { + if (StringUtils.isEmpty(ps.getSource())) { mainPatient = ps; } - if(hospitalId.equals(ps.getHospitalId())){ + if (hospitalId.equals(ps.getHospitalId())) { return ps; } } @@ -2661,13 +2655,12 @@ public class AntenatalExaminationFacade { if (StringUtils.isEmpty(queryRequest.getCardNo()) && StringUtils.isEmpty(queryRequest.getVcCardNo())) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输入查询条件"); } - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), currentGroupHospital, 1, false, og.getbStatus() == 1,hospitalId); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), currentGroupHospital, 1, false, og.getbStatus() == 1, hospitalId); //查询产妇数据 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false); } - if (StringUtils.isNotEmpty(queryRequest.getSupplement())) - { + if (StringUtils.isNotEmpty(queryRequest.getSupplement())) { if (null == patients) { if (StringUtils.isNotEmpty(queryRequest.getCardNo()) || StringUtils.isNotEmpty(queryRequest.getVcCardNo())) { patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1); @@ -2677,9 +2670,7 @@ public class AntenatalExaminationFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("该孕妇在系统中没有档案，请新建档"); } } - } - else - { + } else { if (null == patients) { if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getVcCardNo())) { patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1); @@ -2694,7 +2685,6 @@ public class AntenatalExaminationFacade { } - MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setPid(patients.getPid()); @@ -2716,14 +2706,11 @@ public class AntenatalExaminationFacade { List sortList = new ArrayList<>(); - if (StringUtils.isNotEmpty(queryRequest.getSupplement())) - { + if (StringUtils.isNotEmpty(queryRequest.getSupplement())) { if (fmPatient != null) { - sortList.add(new SortIn(fmPatient,"")); + sortList.add(new SortIn(fmPatient, "")); } - } - else - { + } else { if (fmPatient != null) { fmPatient.setBookbuildingDate(fmPatient.getFmDate()); sortList.add(new SortIn(fmPatient)); @@ -2742,7 +2729,6 @@ public class AntenatalExaminationFacade { } - AntexListResult antexListResult = new AntexListResult(); String pid = patients.getId(); @@ -2778,23 +2764,16 @@ public class AntenatalExaminationFacade { AntExChuQuery antExChuQuery = new AntExChuQuery(); //http://jira.healthbaby.com.cn/browse/WEB-2733 - if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) - { + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) { if (StringUtils.isNotEmpty(queryRequest.getSupplement())) { antExChuQuery.setPid(patients.getPid()); - } - else - { + } else { antExChuQuery.setParentId(patients.getId()); } - } - else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) - { + } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { antExChuQuery.setParentId(patients.getId()); - } - else - { + } else { antExChuQuery.setPid(patients.getPid()); } @@ -2817,27 +2796,19 @@ public class AntenatalExaminationFacade { //http://jira.healthbaby.com.cn/browse/WEB-2733 - if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) - { + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) { if (StringUtils.isNotEmpty(queryRequest.getSupplement())) { antExQuery.setPid(patients.getPid()); - } - else - { + } else { antExQuery.setParentId(patients.getId()); } - } - else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) - { + } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { antExQuery.setParentId(patients.getId()); - } - else - { + } else { antExQuery.setPid(patients.getPid()); } - antExQuery.setStart(max); //查询复诊记录 List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); @@ -2853,16 +2824,11 @@ public class AntenatalExaminationFacade { antExQuery1.setHospitalId(hospitalId); //http://jira.healthbaby.com.cn/browse/WEB-2733 - if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) - { + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) { antExQuery1.setParentId(patients.getId()); - } - else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) - { + } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { antExQuery1.setParentId(patients.getId()); - } - else - { + } else { antExQuery1.setPid(patients.getPid()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index 6e83374..7c1cdbd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -61,7 +61,7 @@ public class AntenatalExaminationResult implements IBasicResultConvert> screenResult; + private List> screenResult; //结果补充 private String resultSupple; @@ -279,8 +279,9 @@ public class AntenatalExaminationResult implements IBasicResultConvert list2 = JsonUtil.toList(destModel.getOtherRisk(), Map.class); Iterator listIterator = list2.iterator(); - while (listIterator.hasNext()){ + while (listIterator.hasNext()) { Map map = listIterator.next(); suppleOtherHigh(map); - if(map.isEmpty()){ + if (map.isEmpty()) { listIterator.remove(); } } setOtherRisk(list2); - } else if(org.apache.commons.lang.StringUtils.isNotEmpty(destModel.getOtherRisk())){ + } else if (org.apache.commons.lang.StringUtils.isNotEmpty(destModel.getOtherRisk())) { Map map = JsonUtil.str2Obj(destModel.getOtherRisk(), Map.class); suppleOtherHigh(map); - if(!map.isEmpty()){ + if (!map.isEmpty()) { setOtherRisk(Arrays.asList(new Object[]{map})); } @@ -989,14 +1006,14 @@ public class AntenatalExaminationResult implements IBasicResultConvert> screenResult; + private List> screenResult; //结果补充 private String resultSupple; @@ -161,22 +161,35 @@ public class AntexChuResult { * 基本信息 **/ private String id; + /** + * 产检项 + */ + private String configItemId; + + public String getConfigItemId() { + return configItemId; + } + + public void setConfigItemId(String configItemId) { + this.configItemId = configItemId; + } + /* //名字 - private String name; - //年龄 - private Integer age; - //孕周 - private String dueWeek; - //预产期 - private String yChanQi; - //手机号 - private String phone; - //高危因素 - private String riskFactor; - //高危评分 - private String riskScore; - //备注 - private String remarks;*/ + private String name; + //年龄 + private Integer age; + //孕周 + private String dueWeek; + //预产期 + private String yChanQi; + //手机号 + private String phone; + //高危因素 + private String riskFactor; + //高危评分 + private String riskScore; + //备注 + private String remarks;*/ //末次月经 private String lastMenses; //预产期 @@ -1619,6 +1632,10 @@ public class AntexChuResult { setCervicalSele(antExChuModel.getCervicalSele()); setUterusSele(antExChuModel.getUterusSele()); setFujianSele(antExChuModel.getFujianSele()); + /** + * 产检项 + * */ + setConfigItemId(antExChuModel.getConfigItemId()); // //早孕期病毒检测 // private String zyqbdjc; // //nt检查 @@ -1723,10 +1740,10 @@ public class AntexChuResult { List list2 = JsonUtil.toList(antExChuModel.getOtherHighRisk(), Map.class); Iterator listIterator = list2.iterator(); - while (listIterator.hasNext()){ + while (listIterator.hasNext()) { Map map = listIterator.next(); suppleOtherHigh(map); - if(map.isEmpty()){ + if (map.isEmpty()) { listIterator.remove(); } } @@ -1734,7 +1751,7 @@ public class AntexChuResult { } else { Map map = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class); suppleOtherHigh(map); - if(!map.isEmpty()){ + if (!map.isEmpty()) { setOtherHighRisk(Arrays.asList(new Object[]{map})); } } @@ -1814,14 +1831,14 @@ public class AntexChuResult { Object idObj1 = map.get("fyyse"); if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { map.put("color", HosptialHighRiskFacade.colorMap.get(idObj1)); - }else{ + } else { map.remove("fyyse"); } //风险评分 Object idObj = map.get("fxpf"); if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) { map.put("scoer", HosptialHighRiskFacade.scoreMap.get(idObj)); - }else{ + } else { map.remove("fxpf"); } }