From 52993349cfcdc67ab5f5fc741d45f410de07bc8d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 4 Jan 2018 15:18:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B8=E5=9F=8E=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/biz/service/PatientsService.java | 10 ++++++++++ .../com/lyms/platform/pojo/AntenatalExaminationModel.java | 10 ++++++++++ .../platform/operate/web/controller/RolesController.java | 2 +- .../platform/operate/web/controller/TestController.java | 1 - .../operate/web/facade/AntenatalExaminationFacade.java | 8 ++++++++ .../com/lyms/platform/operate/web/facade/ViewFacade.java | 3 +++ .../lyms/platform/operate/web/request/AntExAddRequest.java | 12 ++++++++++++ .../operate/web/result/AntenatalExaminationResult.java | 13 +++++++++++++ 8 files changed, 57 insertions(+), 2 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index d1fb509..36efe83 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -7,6 +7,7 @@ import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.enums.SieveStatusEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; @@ -26,6 +27,9 @@ import java.util.List; @Service public class PatientsService { private Logger logger = LoggerFactory.getLogger("SIEVE-JOB"); + + public static final String his_version = PropertiesUtils.getPropertyValue("his_version"); + @Autowired private IPatientDao iPatientDao; @Autowired @@ -178,6 +182,12 @@ public class PatientsService { Date endDate = DateUtil.addDay(DateUtil.formatDate(new Date()), -105); Date start = DateUtil.addDay(DateUtil.formatDate(new Date()), -146); + //诸城产筛范围未11到 20+6 + if(his_version != null && "21".equals(his_version)) + { + endDate = DateUtil.addDay(DateUtil.formatDate(new Date()), -76); + } + PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setLastMensesEnd(endDate); patientsQuery.setLastMensesStart(start); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index 49b18b4..f7acbcd 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -21,6 +21,8 @@ public class AntenatalExaminationModel extends BaseModel { //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项 private String lisCheckItems; + //诸城妇幼复诊特有字段 随机血糖单位mmol/L + private String randomBloodSugar; public String getLisCheckItems() { return lisCheckItems; @@ -100,6 +102,14 @@ public class AntenatalExaminationModel extends BaseModel { this.treatmentOpinion2Types = treatmentOpinion2Types; } + public String getRandomBloodSugar() { + return randomBloodSugar; + } + + public void setRandomBloodSugar(String randomBloodSugar) { + this.randomBloodSugar = randomBloodSugar; + } + private String id; private String barCode; private String pid; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java index 75b5220..4323e40 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java @@ -113,7 +113,7 @@ public class RolesController extends BaseController { rolePermissionMapsService.addRolePermissionMaps(rolePermissionMaps); operateLogFacade.addAddOptLog(getUserId(request), - roles.getOrgId(), permissions, OptActionEnums.ADD.getId(), "管理员角色权限配置"); + roles.getOrgId(), rolePermissionMaps, OptActionEnums.ADD.getId(), "管理员角色权限配置"); } } stopWatch.stop(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 16472a8..6bf2591 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -411,7 +411,6 @@ public class TestController { @ResponseBody public String addSieveJob() { patientsService.addSieveJob(); - ; return "finish"; } 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 f27ef45..80b7251 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 @@ -47,6 +47,9 @@ import java.util.*; public class AntenatalExaminationFacade { private static final Logger logger = LoggerFactory.getLogger(AntenatalExaminationFacade.class); + + public static final String his_version = PropertiesUtils.getPropertyValue("his_version"); + @Autowired private AntenatalExaminationService antenatalExaminationService; @Autowired @@ -1948,6 +1951,11 @@ public class AntenatalExaminationFacade { } int day = DateUtil.getDays(date, new Date()); int start = 15 * 7 + 3; + if (his_version != null && "21".equals(his_version)) + { + start = 11 * 7 ; + } + int end = 20 * 7 + 6; if (day >= start && day <= end) { SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); 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 ff9491e..30684ae 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 @@ -2068,6 +2068,9 @@ public class ViewFacade { //聊城东昌府区妇幼保健医院才用 map.put("lisCheckItems",data.getLisCheckItems()); + //诸城妇幼复诊特有字段 随机血糖单位mmol/L + map.put("randomBloodSugar",StringUtils.isNotEmpty(data.getRandomBloodSugar()) ? data.getRandomBloodSugar()+UnitConstants.MMOLL : ""); + br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(map); 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 9f9976b..50cce39 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 @@ -22,6 +22,9 @@ public class AntExAddRequest implements IBasicRequestConvert