From db1010f5a2ec9ef822be2776f1e3373d45faec7b Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Mon, 20 May 2019 15:08:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=80=BC=E6=9C=8D=E5=8A=A1=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E5=88=B0=E6=8E=A5=E8=AF=8A=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/dao/master/PatientServiceMapper.java | 9 +++++++++ .../permission/service/PatientServiceService.java | 9 +++++++++ .../service/impl/PatientServiceServiceImpl.java | 12 ++++++++++++ .../main/resources/mainOrm/master/PatientService.xml | 9 +++++++++ .../web/facade/AntenatalExaminationFacade.java | 15 +++++++++++++++ .../platform/operate/web/facade/AreaCountFacade.java | 2 +- .../platform/operate/web/facade/BabyCheckFacade.java | 20 ++++++++++++++++++++ .../platform/operate/web/result/AntexListResult.java | 13 +++++++++++++ .../platform/operate/web/result/BabyBasicResult.java | 13 +++++++++++++ 9 files changed, 101 insertions(+), 1 deletion(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java index 1c171a4..371dea8 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java @@ -66,4 +66,13 @@ public interface PatientServiceMapper { List> getServeDetailList(@Param("param") ServiceListQuery param); List getHospitalIds(@Param("param") ServiceListQuery param, @Param("ids") List ids); + + /** + * 查询病人服务list + * + * @param patientsId + * @param patientType + * @return + */ + List getServiceListByParentId(@Param("patientsId") String patientsId, @Param("patientType") Integer patientType); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java index c7bd4a8..594853f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java @@ -30,4 +30,13 @@ public interface PatientServiceService { List> getServeDetailList(ServiceListQuery param); List getHospitalIds(ServiceListQuery param, List ids); + + /** + * 查询病人服务list + * + * @param patientsId 孕妇id/儿童id + * @param patientType 1-孕妇、2-儿童 + * @return + */ + List getServiceListByParentId(String patientsId, Integer patientType); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java index 9c01029..d2c3c41 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java @@ -80,4 +80,16 @@ public class PatientServiceServiceImpl implements PatientServiceService { public List getHospitalIds(ServiceListQuery param, List hospitalIds) { return patientServiceMapper.getHospitalIds(param, hospitalIds); } + + /** + * 查询病人服务list + * + * @param patientsId 孕妇id/儿童id + * @param patientType 1-孕妇、2-儿童 + * @return + */ + @Override + public List getServiceListByParentId(String patientsId, Integer patientType) { + return patientServiceMapper.getServiceListByParentId(patientsId, patientType); + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml index e13e3aa..50ab907 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml @@ -634,6 +634,15 @@ + \ No newline at end of file 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 9a9868e..8f9856a 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 @@ -144,6 +144,9 @@ public class AntenatalExaminationFacade { @Autowired private DiagnoseConfigFacde diagnoseConfigFacde; + @Autowired + private AreaCountFacade areaCountFacade; + /** * 处理区域隐藏建档 * @@ -2910,6 +2913,18 @@ public class AntenatalExaminationFacade { } List> screenList = getscreenResult(patients.getScreenResult()); antexListResult.setScreenResult(screenList); + + // 添加增值服务mane list显示至前端 + List patientServiceList = patientServiceService.getServiceListByParentId(patients.getId(), 1); + ArrayList serTypeNameList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(patientServiceList)){ + for (PatientService patientService: patientServiceList){ + Integer serType = patientService.getSerType(); + String serTypeName = areaCountFacade.getSerTypeName(serType.toString()); + serTypeNameList.add(serTypeName); + } + } + antexListResult.setServiceList(serTypeNameList); } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index d2c182d..fa9d24e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -1226,7 +1226,7 @@ public class AreaCountFacade { } } - private String getSerTypeName(String serType){ + public String getSerTypeName(String serType){ String str = ""; switch (serType){ case "1" : 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 f231e2c..54e5a53 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 @@ -14,9 +14,11 @@ import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.PatientService; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.PatientServiceService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; @@ -96,6 +98,12 @@ public class BabyCheckFacade { @Autowired private OperateLogFacade operateLogFacade; + @Autowired + private PatientServiceService patientServiceService; + + @Autowired + private AreaCountFacade areaCountFacade; + public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); /** @@ -912,6 +920,18 @@ public class BabyCheckFacade { base.setMphone(model.getMphone()); base.setMname(model.getMname()); base.setVcCardNo(model.getVcCardNo()); + + // 把增值服务标记到页面,医生能够知晓，在接种过程中可以适当给予更多关爱 + List patientServiceList = patientServiceService.getServiceListByParentId(model.getId(), 2); + ArrayList serTypeNameList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(patientServiceList)){ + for (PatientService patientService : patientServiceList){ + Integer serType = patientService.getSerType(); + String serTypeName = areaCountFacade.getSerTypeName(serType.toString()); + serTypeNameList.add(serTypeName); + } + } + base.setServiceList(serTypeNameList); } } return model; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 6e0fa97..3fe0714 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -74,6 +74,19 @@ public class AntexListResult { private String fmDate; + /** + * 已开通的增值服务list + */ + private List serviceList; + + public List getServiceList() { + return serviceList; + } + + public void setServiceList(List serviceList) { + this.serviceList = serviceList; + } + // diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java index 9df0f36..32ecde3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java @@ -69,6 +69,19 @@ public class BabyBasicResult { private String correctValue; + /** + * 增值服务name list + */ + private List serviceList; + + public List getServiceList() { + return serviceList; + } + + public void setServiceList(List serviceList) { + this.serviceList = serviceList; + } + public Integer getIsCorrectMonthAge() { return isCorrectMonthAge; } -- 1.8.3.1