From a75b067a763038356a7572559124392cdd709fc9 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Tue, 11 Jun 2019 09:10:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E5=BE=B7=E5=8C=BA=E5=9F=9F=20?= =?UTF-8?q?=E4=BA=A7=E7=AD=9B=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 39 +++++++++++++++++++--- .../operate/web/request/AntExAddRequest.java | 32 +++++++++++++----- .../operate/web/request/AntExcAddRequest.java | 31 ++++++++++++----- 3 files changed, 80 insertions(+), 22 deletions(-) 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 a3f3a41..6e56525 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 @@ -4,6 +4,7 @@ import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.hospitalapi.zcfy.ZcPrenatalService; import com.lyms.platform.beans.MsgRequest; import com.lyms.platform.biz.SequenceConstant; +import com.lyms.platform.biz.dal.ISieveDao; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.dao.operator.MongoQuery; @@ -147,6 +148,9 @@ public class AntenatalExaminationFacade { @Autowired private AreaCountFacade areaCountFacade; + @Autowired + private ISieveDao sieveDao; + /** * 处理区域隐藏建档 * @@ -334,6 +338,20 @@ public class AntenatalExaminationFacade { Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); model.setPid(patients.getPid()); + /** + * 承德区域 产筛状态修改 + * */ + if (null != antExAddRequest.getScreeningState() && StringUtils.isNotEmpty(antExAddRequest.getParentId())) { + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setParentId(antExAddRequest.getParentId()); + List sieveModels = sieveDao.queryList(sieveQuery.convertToQuery()); + for (SieveModel sieveModel : sieveModels) { + sieveModel.setStatus(antExAddRequest.getScreeningState()); + sieveDao.updateChanQianSieve(sieveModel); + } + } + antenatalExaminationService.addOneBabyAnt(model); /** 验证产检券是否可用 可用就改为已使用状态 */ @@ -680,6 +698,21 @@ public class AntenatalExaminationFacade { applyOrderService.updateByParentId(referralApplyOrderQuery2, model); } } + /** + * 承德区域 产筛状态修改 + * */ + if (null != excAddRequest.getScreeningState() && StringUtils.isNotEmpty(excAddRequest.getParentId())) { + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setParentId(excAddRequest.getParentId()); + List sieveModels = sieveDao.queryList(sieveQuery.convertToQuery()); + for (SieveModel sieveModel : sieveModels) { + sieveModel.setStatus(excAddRequest.getScreeningState()); + sieveDao.updateChanQianSieve(sieveModel); + } + } + + //初诊是添加追访记录 addTrackDownInfo(userId, patients); } else { @@ -2917,8 +2950,8 @@ public class AntenatalExaminationFacade { // 添加增值服务mane list显示至前端 List patientServiceList = patientServiceService.getServiceListByParentId(patients.getId(), 1); ArrayList serTypeNameList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(patientServiceList)){ - for (PatientService patientService: patientServiceList){ + if (CollectionUtils.isNotEmpty(patientServiceList)) { + for (PatientService patientService : patientServiceList) { Integer serType = patientService.getSerType(); String serTypeName = areaCountFacade.getSerTypeName(serType.toString()); serTypeNameList.add(serTypeName); @@ -3105,7 +3138,6 @@ public class AntenatalExaminationFacade { antenatalExaminationResult.setTireData(examinationModel.getTireData()); - object = antenatalExaminationResult; } else { //查询初诊数据 @@ -3238,7 +3270,6 @@ public class AntenatalExaminationFacade { antexChuResult.setPlacentas(antExChuModel.getPlacentas()); - object = antexChuResult; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 60c617f..3c4ca3d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -288,7 +288,7 @@ public class AntExAddRequest implements IBasicRequestConvert { private String yghxkt; - // 乙肝表面抗原 private String ygbmkyValue; //乙肝表面抗体 @@ -427,6 +426,19 @@ public class AntExcAddRequest implements IBasicRequestConvert { */ private String ndbSelectOtherVal; + /** + * 承德环境 添加字段 + */ + private Integer screeningState; + + public Integer getScreeningState() { + return screeningState; + } + + public void setScreeningState(Integer screeningState) { + this.screeningState = screeningState; + } + public String getQuickenSelect() { return quickenSelect; } @@ -1984,6 +1996,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setHivktSelect(hivktSelect); antExChuModel.setSyjgSelect(syjgSelect); antExChuModel.setInfectDiseases(JsonUtil.obj2JsonString(infectDiseases)); + // //早孕期病毒检测 // private String zyqbd; // //nt检查 @@ -2150,28 +2163,28 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setMonthCompliance(monthCompliance); antExChuModel.setPregnancyExcpetion(pregnancyExcpetion); - if (StringUtils.isNotEmpty(fuweiSelect)){ + if (StringUtils.isNotEmpty(fuweiSelect)) { antExChuModel.setFuweiSelect(fuweiSelect); } - if (StringUtils.isNotEmpty(edemaSelect)){ + if (StringUtils.isNotEmpty(edemaSelect)) { antExChuModel.setEdemaSelect(edemaSelect); } - if (StringUtils.isNotEmpty(tireNumberSelect)){ + if (StringUtils.isNotEmpty(tireNumberSelect)) { antExChuModel.setTireNumberSelect(tireNumberSelect); } - if (StringUtils.isNotEmpty(quickenSelect)){ + if (StringUtils.isNotEmpty(quickenSelect)) { antExChuModel.setQuickenSelect(quickenSelect); } - if (StringUtils.isNotEmpty(xhdbSelect)){ + if (StringUtils.isNotEmpty(xhdbSelect)) { antExChuModel.setXhdbSelect(xhdbSelect); } - if (StringUtils.isNotEmpty(xhdbSelectOtherVal)){ + if (StringUtils.isNotEmpty(xhdbSelectOtherVal)) { antExChuModel.setXhdbSelectOtherVal(xhdbSelectOtherVal); } - if (StringUtils.isNotEmpty(ndbSelect)){ + if (StringUtils.isNotEmpty(ndbSelect)) { antExChuModel.setNdbSelect(ndbSelect); } - if (StringUtils.isNotEmpty(ndbSelectOtherVal)){ + if (StringUtils.isNotEmpty(ndbSelectOtherVal)) { antExChuModel.setNdbSelectOtherVal(ndbSelectOtherVal); } return antExChuModel; -- 1.8.3.1