diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index a5b4899..f8ea7cd 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -736,6 +736,17 @@ public class BabyModel extends BaseModel { } /***********************************************************/ + //滦平儿童建档下次检查项 + private String nextCheckItem; + + public String getNextCheckItem() { + return nextCheckItem; + } + + public void setNextCheckItem(String nextCheckItem) { + this.nextCheckItem = nextCheckItem; + } + public Integer getDeafnessGene() { return deafnessGene; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index b53f66e..32d332b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -518,6 +518,8 @@ public class BabyBookbuildingFacade { model.setId(request.getId()); model.setPid(pid); + //滦平儿童建档-下次检查项 + model.setNextCheckItem(request.getNextCheckItem()); patientsService.updateRefer(model); //如果当前是建档医院,那么需要修改其他非建档医院的数据 if (autoMatchFacade.checkBStatus(userId)) { @@ -901,6 +903,8 @@ public class BabyBookbuildingFacade { model.setEndCase(0);//秦皇岛，默认未结案 setRiskCode(model); + //滦平儿童建档-下次检查项 + model.setNextCheckItem(request.getNextCheckItem()); model = babyBookbuildingService.addBabyBookbuilding(model); @@ -1761,6 +1765,10 @@ public class BabyBookbuildingFacade { result.setmHighRiskReason(riskList); } } + //滦平-儿童建档下次检查项 + if(StringUtils.isNotEmpty(model.getNextCheckItem())){ + result.setNextCheckItem(model.getNextCheckItem()); + } } /** 优惠券编号 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 74a10e2..0e4e2ab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -4678,7 +4678,7 @@ public class BabyCheckFacade extends BaseServiceImpl { /** * 1-4个月 */ - cms=1;cme=4; + cms=1;cme=3; middleHls="60";middleHln="89"; matterHls="30";matterHln="59";severityHll="30"; break; @@ -4686,7 +4686,7 @@ public class BabyCheckFacade extends BaseServiceImpl { /** * 4-6个月 */ - cms=4;cme=6; + cms=4;cme=5; //（90-100g/l） lightHls="90";lightHln="100"; middleHls="60";middleHln="89"; matterHls="30";matterHln="59";severityHll="30"; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index f1bb75b..760c4ae 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -5600,6 +5600,10 @@ public class ViewFacade { result.setDiseases(diseases.toString()); result.setRiskCode(com.lyms.platform.common.utils.StringUtils.riskCodeStr(model.getRiskCode())); + //滦平-儿童建档下次检查项 + if(StringUtils.isNotEmpty(model.getNextCheckItem())){ + result.setNextCheckItem(model.getNextCheckItem()); + } } /** 优惠券编号 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index de278b5..55c1b9e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -420,6 +420,17 @@ public class BabyBookbuildingAddRequest { /********************************************/ + //滦平儿童建档下次检查项 + private String nextCheckItem; + + public String getNextCheckItem() { + return nextCheckItem; + } + + public void setNextCheckItem(String nextCheckItem) { + this.nextCheckItem = nextCheckItem; + } + public List getDiseases() { return diseases; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index 6b72b1f..d44005d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -362,6 +362,16 @@ public class BabyBuildResult { /********************************************/ + //滦平儿童建档下次检查项 + private String nextCheckItem; + + public String getNextCheckItem() { + return nextCheckItem; + } + + public void setNextCheckItem(String nextCheckItem) { + this.nextCheckItem = nextCheckItem; + } public List getDiseases() { return diseases; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index 9e1712c..5404fed 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -355,6 +355,16 @@ public class BabyPageResult implements IBasicResultConvert