jiangjiazhi / regional-platform

Commit db1010f5a2ec9ef822be2776f1e3373d45faec7b

Authored by dongqin about 6 years ago

Exists in master and in 6 other branches

增值服务标记到接诊页面

Showing 9 changed files with 101 additions and 1 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java
platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java

...	...	@@ -66,5 +66,14 @@
66	66	List<Map<String, Object>> getServeDetailList(@Param("param") ServiceListQuery param);
67	67
68	68	List<String> getHospitalIds(@Param("param") ServiceListQuery param, @Param("ids") List<String> ids);
	69	+
	70	+ /**
	71	+ * 查询病人服务list
	72	+ *
	73	+ * @param patientsId
	74	+ * @param patientType
	75	+ * @return
	76	+ */
	77	+ List<PatientService> getServiceListByParentId(@Param("patientsId") String patientsId, @Param("patientType") Integer patientType);
69	78	}

...	...	@@ -30,5 +30,14 @@
30	30	List<Map<String, Object>> getServeDetailList(ServiceListQuery param);
31	31
32	32	List<String> getHospitalIds(ServiceListQuery param, List<String> ids);
	33	+
	34	+ /**
	35	+ * 查询病人服务list
	36	+ *
	37	+ * @param patientsId 孕妇id/儿童id
	38	+ * @param patientType 1-孕妇、2-儿童
	39	+ * @return
	40	+ */
	41	+ List<PatientService> getServiceListByParentId(String patientsId, Integer patientType);
33	42	}

...	...	@@ -80,5 +80,17 @@
80	80	public List<String> getHospitalIds(ServiceListQuery param, List<String> hospitalIds) {
81	81	return patientServiceMapper.getHospitalIds(param, hospitalIds);
82	82	}
	83	+
	84	+ /**
	85	+ * 查询病人服务list
	86	+ *
	87	+ * @param patientsId 孕妇id/儿童id
	88	+ * @param patientType 1-孕妇、2-儿童
	89	+ * @return
	90	+ */
	91	+ @Override
	92	+ public List<PatientService> getServiceListByParentId(String patientsId, Integer patientType) {
	93	+ return patientServiceMapper.getServiceListByParentId(patientsId, patientType);
	94	+ }
83	95	}

...	...	@@ -634,6 +634,15 @@
634	634	</if>
635	635
636	636	</select>
	637	+ <select id="getServiceListByParentId" resultType="com.lyms.platform.permission.model.PatientService">
	638	+SELECT
	639	+ id as id,
	640	+ parentid as parentid,
	641	+ ser_type as serType
	642	+FROM
	643	+ patient_service
	644	+where parentid = #{patientsId} and ser_status = 1 and per_type = #{patientType}
	645	+ </select>
637	646
638	647
639	648	</mapper>

...	...	@@ -144,6 +144,9 @@
144	144	@Autowired
145	145	private DiagnoseConfigFacde diagnoseConfigFacde;
146	146
	147	+ @Autowired
	148	+ private AreaCountFacade areaCountFacade;
	149	+
147	150	/**
148	151	* 处理区域隐藏建档
149	152	*
...	...	@@ -2910,6 +2913,18 @@
2910	2913	}
2911	2914	List<Map<String, Object>> screenList = getscreenResult(patients.getScreenResult());
2912	2915	antexListResult.setScreenResult(screenList);
	2916	+
	2917	+ // 添加增值服务mane list显示至前端
	2918	+ List<PatientService> patientServiceList = patientServiceService.getServiceListByParentId(patients.getId(), 1);
	2919	+ ArrayList<String> serTypeNameList = new ArrayList<>();
	2920	+ if (CollectionUtils.isNotEmpty(patientServiceList)){
	2921	+ for (PatientService patientService: patientServiceList){
	2922	+ Integer serType = patientService.getSerType();
	2923	+ String serTypeName = areaCountFacade.getSerTypeName(serType.toString());
	2924	+ serTypeNameList.add(serTypeName);
	2925	+ }
	2926	+ }
	2927	+ antexListResult.setServiceList(serTypeNameList);
2913	2928	}
2914	2929	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
2915	2930	}

...	...	@@ -1226,7 +1226,7 @@
1226	1226	}
1227	1227	}
1228	1228
1229		- private String getSerTypeName(String serType){
	1229	+ public String getSerTypeName(String serType){
1230	1230	String str = "";
1231	1231	switch (serType){
1232	1232	case "1" :

...	...	@@ -14,9 +14,11 @@
14	14	import com.lyms.platform.operate.web.utils.MongoUtil;
15	15	import com.lyms.platform.permission.dao.master.CouponMapper;
16	16	import com.lyms.platform.permission.model.Organization;
	17	+import com.lyms.platform.permission.model.PatientService;
17	18	import com.lyms.platform.permission.model.Users;
18	19	import com.lyms.platform.permission.service.CouponService;
19	20	import com.lyms.platform.permission.service.OrganizationService;
	21	+import com.lyms.platform.permission.service.PatientServiceService;
20	22	import com.lyms.platform.permission.service.UsersService;
21	23	import com.lyms.platform.pojo.*;
22	24	import com.lyms.platform.query.*;
...	...	@@ -96,6 +98,12 @@
96	98	@Autowired
97	99	private OperateLogFacade operateLogFacade;
98	100
	101	+ @Autowired
	102	+ private PatientServiceService patientServiceService;
	103	+
	104	+ @Autowired
	105	+ private AreaCountFacade areaCountFacade;
	106	+
99	107	public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
100	108
101	109	/**
...	...	@@ -912,6 +920,18 @@
912	920	base.setMphone(model.getMphone());
913	921	base.setMname(model.getMname());
914	922	base.setVcCardNo(model.getVcCardNo());
	923	+
	924	+ // 把增值服务标记到页面,医生能够知晓，在接种过程中可以适当给予更多关爱
	925	+ List<PatientService> patientServiceList = patientServiceService.getServiceListByParentId(model.getId(), 2);
	926	+ ArrayList<String> serTypeNameList = new ArrayList<>();
	927	+ if (CollectionUtils.isNotEmpty(patientServiceList)){
	928	+ for (PatientService patientService : patientServiceList){
	929	+ Integer serType = patientService.getSerType();
	930	+ String serTypeName = areaCountFacade.getSerTypeName(serType.toString());
	931	+ serTypeNameList.add(serTypeName);
	932	+ }
	933	+ }
	934	+ base.setServiceList(serTypeNameList);
915	935	}
916	936	}
917	937	return model;

...	...	@@ -74,6 +74,19 @@
74	74
75	75	private String fmDate;
76	76
	77	+ /**
	78	+ * 已开通的增值服务list
	79	+ */
	80	+ private List<String> serviceList;
	81	+
	82	+ public List<String> getServiceList() {
	83	+ return serviceList;
	84	+ }
	85	+
	86	+ public void setServiceList(List<String> serviceList) {
	87	+ this.serviceList = serviceList;
	88	+ }
	89	+
77	90	//<!---------基本信息----------->
78	91
79	92

...	...	@@ -69,6 +69,19 @@
69	69
70	70	private String correctValue;
71	71
	72	+ /**
	73	+ * 增值服务name list
	74	+ */
	75	+ private List<String> serviceList;
	76	+
	77	+ public List<String> getServiceList() {
	78	+ return serviceList;
	79	+ }
	80	+
	81	+ public void setServiceList(List<String> serviceList) {
	82	+ this.serviceList = serviceList;
	83	+ }
	84	+
72	85	public Integer getIsCorrectMonthAge() {
73	86	return isCorrectMonthAge;
74	87	}