jiangjiazhi / regional-platform

Commit d749c2c746d5e160b25275d0c93b38529f452432

Authored by haorp 8 months ago

Exists in dev

小程序调用-产后康复

Showing 5 changed files with 137 additions and 3 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/AppointmentMapper.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/AppointmentService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java
platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/matnRehabPC/service/impl/MatnRehabServiceImpl.java

1	1	package com.lyms.platform.permission.dao.master;
2	2
3	3	import com.lyms.platform.permission.model.AppointmentQuery;
	4	+import com.lyms.platform.permission.model.MedicalRecordVo;
4	5	import com.lyms.platform.pojo.AppointmentModel;
5	6
6	7	import java.util.List;
...	...	@@ -8,5 +9,7 @@
8	9	public interface AppointmentMapper {
9	10	List<AppointmentModel> queryAppointment(AppointmentQuery appointmentQuery);
10	11	int queryAppointmentCount(AppointmentQuery appointmentQuery);
	12	+
	13	+ List<MedicalRecordVo> queryList(MedicalRecordVo medicalRecordVo);
11	14	}

1	1	package com.lyms.platform.permission.service;
2	2
3	3	import com.lyms.platform.permission.model.AppointmentQuery;
	4	+import com.lyms.platform.permission.model.MedicalRecordVo;
4	5	import com.lyms.platform.pojo.AppointmentModel;
5	6
6		-import javax.servlet.http.HttpServletResponse;
7	7	import java.util.List;
8	8
9	9	public interface AppointmentService {
10	10	List<AppointmentModel> queryAppointment(AppointmentQuery appointmentQuery);
11	11	int queryAppointmentCount(AppointmentQuery appointmentQuery);
	12	+
	13	+ List<MedicalRecordVo> queryList(MedicalRecordVo medicalRecordVo);
12	14	}

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.common.utils.StringUtils;
4	4	import com.lyms.platform.permission.dao.master.AppointmentMapper;
5	5	import com.lyms.platform.permission.model.AppointmentQuery;
	6	+import com.lyms.platform.permission.model.MedicalRecordVo;
6	7	import com.lyms.platform.permission.service.AppointmentService;
7	8	import com.lyms.platform.pojo.AppointmentModel;
8	9	import com.lyms.platform.pojo.DtFm;
...	...	@@ -32,6 +33,11 @@
32	33	@Override
33	34	public int queryAppointmentCount(AppointmentQuery appointmentQuery) {
34	35	return appointmentMapper.queryAppointmentCount(appointmentQuery);
	36	+ }
	37	+
	38	+ @Override
	39	+ public List<MedicalRecordVo> queryList(MedicalRecordVo medicalRecordVo) {
	40	+ return appointmentMapper.queryList(medicalRecordVo);
35	41	}
36	42	}

...	...	@@ -66,5 +66,128 @@
66	66	and <![CDATA[checkTime>=#{startTime}]]>
67	67	and <![CDATA[checkTime<=#{endTime}]]>
68	68	</select>
	69	+
	70	+
	71	+ <select id="queryList" parameterType="com.lyms.platform.permission.model.MedicalRecordVo" resultType="com.lyms.platform.permission.model.MedicalRecordVo">
	72	+ SELECT
	73	+ MDTRT_ID as mdtrtId,
	74	+ PID ,
	75	+ NAME,
	76	+ CARD_NO as cardNo,
	77	+ AGE,
	78	+ PHONE,
	79	+ GENDER,
	80	+ ZY_TYPE as zyType,
	81	+ MED_TYPE as medType,
	82	+ DEPARTMENT,
	83	+ DIAGNOSIS,
	84	+ DIAGNOSIS_CODE as diagnosisCode,
	85	+ OPERATION,
	86	+ OPERATION_CODE as oprtationCode,
	87	+ MEDICINE,
	88	+ DELIVERY_TYPE as deliveryType,
	89	+ DELIVERY_TIME as deliveryTime,
	90	+ MATN_AFTER_DAY as matnAfterDay,
	91	+ FEED_TYPE as feedType,
	92	+ MATN_HISTORY as matnHistory,
	93	+ MODIFIED,
	94	+ CREATED
	95	+ FROM medical_record
	96	+ WHERE 1=1
	97	+
	98	+ <!-- 基本信息查询条件 -->
	99	+ <if test="mdtrtId != null and mdtrtId != ''">
	100	+ AND MDTRT_ID = #{mdtrtId}
	101	+ </if>
	102	+
	103	+ <if test="pid != null and pid != ''">
	104	+ AND PID = #{pid}
	105	+ </if>
	106	+
	107	+ <if test="name != null and name != ''">
	108	+ AND NAME = #{name}
	109	+ </if>
	110	+
	111	+ <if test="cardNo != null and cardNo != ''">
	112	+ AND CARD_NO = #{cardNo}
	113	+ </if>
	114	+
	115	+ <if test="age != null">
	116	+ AND AGE = #{age}
	117	+ </if>
	118	+
	119	+ <if test="phone != null and phone != ''">
	120	+ AND PHONE = #{phone}
	121	+ </if>
	122	+
	123	+ <if test="gender != null and gender != ''">
	124	+ AND GENDER = #{gender}
	125	+ </if>
	126	+
	127	+ <!-- 医疗信息查询条件 -->
	128	+ <if test="zyType != null and zyType != ''">
	129	+ AND ZY_TYPE = #{zyType}
	130	+ </if>
	131	+
	132	+ <if test="medType != null and medType != ''">
	133	+ AND MED_TYPE = #{medType}
	134	+ </if>
	135	+
	136	+ <if test="department != null and department != ''">
	137	+ AND DEPARTMENT = #{department}
	138	+ </if>
	139	+
	140	+ <if test="diagnosis != null and diagnosis != ''">
	141	+ AND DIAGNOSIS = #{diagnosis}
	142	+ </if>
	143	+
	144	+ <if test="diagnosisCode != null and diagnosisCode != ''">
	145	+ AND DIAGNOSIS_CODE = #{diagnosisCode}
	146	+ </if>
	147	+
	148	+ <if test="operation != null and operation != ''">
	149	+ AND OPERATION = #{operation}
	150	+ </if>
	151	+
	152	+ <if test="operationCode != null and operationCode != ''">
	153	+ AND OPERATION_CODE = #{operationCode}
	154	+ </if>
	155	+
	156	+ <if test="medicine != null and medicine != ''">
	157	+ AND MEDICINE = #{medicine}
	158	+ </if>
	159	+
	160	+ <!-- 分娩与产后信息查询条件 -->
	161	+ <if test="deliveryType != null and deliveryType != ''">
	162	+ AND DELIVERY_TYPE = #{deliveryType}
	163	+ </if>
	164	+
	165	+ <if test="deliveryTime != null">
	166	+ AND DELIVERY_TIME = #{deliveryTime}
	167	+ </if>
	168	+
	169	+ <if test="matnAfterDay != null">
	170	+ AND MATN_AFTER_DAY = #{matnAfterDay}
	171	+ </if>
	172	+
	173	+ <if test="feedType != null and feedType != ''">
	174	+ AND FEED_TYPE = #{feedType}
	175	+ </if>
	176	+
	177	+ <if test="matnHistory != null and matnHistory != ''">
	178	+ AND MATN_HISTORY = #{matnHistory}
	179	+ </if>
	180	+
	181	+ <!-- 时间范围查询条件 -->
	182	+ <if test="modified != null">
	183	+ AND MODIFIED = #{modified}
	184	+ </if>
	185	+
	186	+ <if test="created != null">
	187	+ AND CREATED = #{created}
	188	+ </if>
	189	+
	190	+ ORDER BY CREATED DESC
	191	+ </select>
69	192	</mapper>

...	...	@@ -40,7 +40,7 @@
40	40	private PatientWeightService2 patientWeightService2;
41	41
42	42	@Autowired
43		- private MedicalRecordService medicalRecordService;
	43	+ private AppointmentService appointmentService;
44	44
45	45	@Override
46	46	public BaseObjectResponse queryInfo(String phone) {
...	...	@@ -74,7 +74,7 @@
74	74	MedicalRecordVo medicalRecordVo = new MedicalRecordVo();
75	75	medicalRecordVo.setCardNo(patients.getCardNo());
76	76	// 诊断手术赋值
77		- List<MedicalRecordVo> list = medicalRecordService.queryList(medicalRecordVo);
	77	+ List<MedicalRecordVo> list = appointmentService.queryList(medicalRecordVo);
78	78	if(CollectionUtils.isNotEmpty(list)){
79	79	MedicalRecordVo medicalRecordVo1 = list.get(0);
80	80	data.put("diagnosis",medicalRecordVo1.getDiagnosis());