diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index dfbc68e..07ff451 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -166,20 +166,7 @@ public class DischargeAbstractFacade extends BaseServiceImpl { if (StringUtils.isEmpty(dischargeAbstractBabyModel.getId())) { dischargeAbstractBabyModelList.add(dischargeAbstractBabyModel); } else { - dischargeAbstractBabyService.update(dischargeAbstractBabyModel); - BabyModelQuery babyQuery = new BabyModelQuery(); - babyQuery.setPid(dischargeAbstractBabyModel.getpId()); - //查询儿童的基本信息 - List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery); - for (BabyModel b: babyModels) {//如果出院小结前有多个儿童档案都更新，后就无法控制了 - BabyModel babyModel = setBabyModel(dischargeAbstractBabyModel, b); - babyModel.setTxngNew(dischargeAbstractBabyModel.getTxngNew()); - babyModel.setKouqNew(dischargeAbstractBabyModel.getKouqNew()); - if(babyModel !=null && StringUtils.isNotBlank(babyModel.getId())){ - babyBookbuildingService.updateBabyBuild(babyModel,babyModel.getId()); - } - } } } } @@ -204,7 +191,7 @@ public class DischargeAbstractFacade extends BaseServiceImpl { } } } - + } dischargeAbstractSaveResult.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -218,81 +205,81 @@ public class DischargeAbstractFacade extends BaseServiceImpl { /* if(babyModel.getEsfs() == null && dabm.getEsfs()!=null){//耳声发射（1通过/2未通过） babyModel.setEsfs(dabm.getEsfs()); }*/ - if(babyModel.getIsUNHS() == null && dabm.getIsUNHS()!=null){//听力是否筛查== 耳声发射,以前的耳声发射不要了 - babyModel.setIsUNHS(dabm.getIsUNHS()); - } - if(babyModel.getHearScrResult() == null && dabm.getHearScrResult()!=null){//听筛结果 - babyModel.setHearScrResult(dabm.getHearScrResult()); - } + if(babyModel.getIsUNHS() == null && dabm.getIsUNHS()!=null){//听力是否筛查== 耳声发射,以前的耳声发射不要了 + babyModel.setIsUNHS(dabm.getIsUNHS()); + } + if(babyModel.getHearScrResult() == null && dabm.getHearScrResult()!=null){//听筛结果 + babyModel.setHearScrResult(dabm.getHearScrResult()); + } - if(babyModel.getTxng() == null && dabm.getTxng()!=null){//听性脑干（1通过/2未通过） - babyModel.setTxng(dabm.getTxng()); - } - // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)不在使用 - // "txngState":1 （20210122 张洁滦平需求 新增 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过） - if(babyModel.getTxngNew() == null && dabm.getTxngNew()!=null){ - babyModel.setTxngNew(dabm.getTxngNew()); - } + if(babyModel.getTxng() == null && dabm.getTxng()!=null){//听性脑干（1通过/2未通过） + babyModel.setTxng(dabm.getTxng()); + } + // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)不在使用 + // "txngState":1 （20210122 张洁滦平需求 新增 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过） + if(babyModel.getTxngNew() == null && dabm.getTxngNew()!=null){ + babyModel.setTxngNew(dabm.getTxngNew()); + } - if(babyModel.getEljy() == null && dabm.getEljy()!=null){//耳聋基因（1通过/2未通过） - babyModel.setEljy(dabm.getEljy()); - } - if(babyModel.getKouq() == null && dabm.getKouq()!=null){ //口腔（1通过/2未通过） - babyModel.setKouq(dabm.getKouq()); - } - if(babyModel.getKouqNew() == null && dabm.getKouqNew()!=null){ //修改口腔检查：yesOrNo yes○正常 no○异常：下拉项：cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____ - babyModel.setKouqNew(dabm.getKouqNew()); - } - if(babyModel.getIsBCG() == null && dabm.getIsBCG()!=null){ //是否接种卡介苗 - babyModel.setIsBCG(dabm.getIsBCG()); - } - if(babyModel.getbCGVaccinDate() == null && dabm.getbCGVaccinDate()!=null){ //卡介苗接种日期 - babyModel.setbCGVaccinDate(dabm.getbCGVaccinDate()); - } - if(babyModel.getbCGInjectUserName() == null && dabm.getbCGInjectUserName()!=null){ //卡介苗接种注射者 - babyModel.setbCGInjectUserName(dabm.getbCGInjectUserName()); - } - if(babyModel.getIsHBV() == null && dabm.getIsHBV()!=null){ //是否接种乙肝疫苗 1 已接种 0 未接种 - babyModel.setIsHBV(dabm.getIsHBV()); - } - if(babyModel.getHbvVaccinDate() == null && dabm.getHbvVaccinDate()!=null){ //乙肝疫苗接种日期 - babyModel.setHbvVaccinDate(dabm.getHbvVaccinDate()); - } - if(babyModel.getbCGAndHBVVaccinationDosage() == null && dabm.getbCGAndHBVVaccinationDosage()!=null){//乙肝疫苗接种剂量 - babyModel.setbCGAndHBVVaccinationDosage(dabm.getbCGAndHBVVaccinationDosage()); - } - if(babyModel.getHbvInjectUserName() == null && dabm.getHbvInjectUserName()!=null){ //乙肝疫苗注射者 - babyModel.setHbvInjectUserName(dabm.getHbvInjectUserName()); - } - if(babyModel.getIsHBIG() == null && dabm.getIsHBIG()!=null){ //是否注射乙肝免疫球蛋白 - babyModel.setIsHBIG(dabm.getIsHBIG()); - } - if(babyModel.gethBIGInjectDate() == null && dabm.gethBIGInjectDate()!=null){ //乙肝免疫球蛋白注射日期 - babyModel.sethBIGInjectDate(dabm.gethBIGInjectDate()); - } - if(babyModel.gethBIGInjectDosage() == null && dabm.gethBIGInjectDosage()!=null){ //是否注射乙肝免疫球蛋白 - babyModel.sethBIGInjectDosage(dabm.gethBIGInjectDosage()); - } - if(babyModel.gethBIGInjectUserName() == null && dabm.gethBIGInjectUserName()!=null){ //是否注射乙肝免疫球蛋白 - babyModel.sethBIGInjectUserName(dabm.gethBIGInjectUserName()); - } + if(babyModel.getEljy() == null && dabm.getEljy()!=null){//耳聋基因（1通过/2未通过） + babyModel.setEljy(dabm.getEljy()); + } + if(babyModel.getKouq() == null && dabm.getKouq()!=null){ //口腔（1通过/2未通过） + babyModel.setKouq(dabm.getKouq()); + } + if(babyModel.getKouqNew() == null && dabm.getKouqNew()!=null){ //修改口腔检查：yesOrNo yes○正常 no○异常：下拉项：cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____ + babyModel.setKouqNew(dabm.getKouqNew()); + } + if(babyModel.getIsBCG() == null && dabm.getIsBCG()!=null){ //是否接种卡介苗 + babyModel.setIsBCG(dabm.getIsBCG()); + } + if(babyModel.getbCGVaccinDate() == null && dabm.getbCGVaccinDate()!=null){ //卡介苗接种日期 + babyModel.setbCGVaccinDate(dabm.getbCGVaccinDate()); + } + if(babyModel.getbCGInjectUserName() == null && dabm.getbCGInjectUserName()!=null){ //卡介苗接种注射者 + babyModel.setbCGInjectUserName(dabm.getbCGInjectUserName()); + } + if(babyModel.getIsHBV() == null && dabm.getIsHBV()!=null){ //是否接种乙肝疫苗 1 已接种 0 未接种 + babyModel.setIsHBV(dabm.getIsHBV()); + } + if(babyModel.getHbvVaccinDate() == null && dabm.getHbvVaccinDate()!=null){ //乙肝疫苗接种日期 + babyModel.setHbvVaccinDate(dabm.getHbvVaccinDate()); + } + if(babyModel.getbCGAndHBVVaccinationDosage() == null && dabm.getbCGAndHBVVaccinationDosage()!=null){//乙肝疫苗接种剂量 + babyModel.setbCGAndHBVVaccinationDosage(dabm.getbCGAndHBVVaccinationDosage()); + } + if(babyModel.getHbvInjectUserName() == null && dabm.getHbvInjectUserName()!=null){ //乙肝疫苗注射者 + babyModel.setHbvInjectUserName(dabm.getHbvInjectUserName()); + } + if(babyModel.getIsHBIG() == null && dabm.getIsHBIG()!=null){ //是否注射乙肝免疫球蛋白 + babyModel.setIsHBIG(dabm.getIsHBIG()); + } + if(babyModel.gethBIGInjectDate() == null && dabm.gethBIGInjectDate()!=null){ //乙肝免疫球蛋白注射日期 + babyModel.sethBIGInjectDate(dabm.gethBIGInjectDate()); + } + if(babyModel.gethBIGInjectDosage() == null && dabm.gethBIGInjectDosage()!=null){ //是否注射乙肝免疫球蛋白 + babyModel.sethBIGInjectDosage(dabm.gethBIGInjectDosage()); + } + if(babyModel.gethBIGInjectUserName() == null && dabm.gethBIGInjectUserName()!=null){ //是否注射乙肝免疫球蛋白 + babyModel.sethBIGInjectUserName(dabm.gethBIGInjectUserName()); + } - if(dabm.getIsHighRisk() != null){ //是否是高危儿童 - if ("yes".equals(dabm.getIsHighRisk())) - { - babyModel.setHighRisk(1); - if (dabm.getHighRiskResult() != null && dabm.getHighRiskResult().size() > 0) - { - Map riskMap = dabm.getHighRiskResult(); - babyModel.setHighRiskInfo(getRiskId(riskMap)); - } - } - else if ("no".equals(dabm.getIsHighRisk())) + if(babyModel.getHighRisk() == null && dabm.getIsHighRisk() != null){ //是否是高危儿童 + if ("yes".equals(dabm.getIsHighRisk())) + { + babyModel.setHighRisk(1); + if (dabm.getHighRiskResult() != null && dabm.getHighRiskResult().size() > 0) { - babyModel.setHighRisk(0); + Map riskMap = dabm.getHighRiskResult(); + babyModel.setHighRiskInfo(getRiskId(riskMap)); } } + else if ("no".equals(dabm.getIsHighRisk())) + { + babyModel.setHighRisk(0); + } + } return babyModel; @@ -335,7 +322,7 @@ public class DischargeAbstractFacade extends BaseServiceImpl { } } } - return risks; + return risks; } public DischargeAbstractQueryResult query(DischargeAbstractQueryRequest dischargeAbstractSaveRequest) {