jiangjiazhi / regional-platform

Commit 68b90b9bdfb1e4c6952111ec4f9d3422c02c35d0

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

听力诊断模块

Showing 4 changed files with 63 additions and 27 deletions

platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PieReportModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java

...	...	@@ -299,32 +299,32 @@
299	299	GROUP BY back_doctor;
300	300	</select>
301	301
302		- <select id="reportPatMarkHospByInDoctor" resultType="com.lyms.platform.permission.model.ReportMakeHosptail"
303		- parameterType="com.lyms.platform.permission.model.PatientMarkHospitalQuery">
304		- SELECT
305		- in_hospit_doctor as doctorId,
306		- count(*) AS num,
307		- sum(
308		- CASE in_hospit_result
309		- WHEN 1 THEN
310		- 1
311		- ELSE
312		- 0
313		- END
314		- ) AS succNum,
315		- sum(
316		- CASE in_hospit_result
317		- WHEN 2 THEN
318		- 1
319		- ELSE
320		- 0
321		- END
322		- ) AS errNum from
323		- patient_mark_hospital
324		- <include refid="PatientMarkHospitalCondition"/>
325		- and in_hospit_doctor is not null
326		- GROUP BY in_hospit_doctor;
327		- </select>
	302	+ <!--<select id="reportPatMarkHospByInDoctor" resultType="com.lyms.platform.permission.model.ReportMakeHosptail"-->
	303	+ <!--parameterType="com.lyms.platform.permission.model.PatientMarkHospitalQuery">-->
	304	+ <!--SELECT-->
	305	+ <!--in_hospit_doctor as doctorId,-->
	306	+ <!--count(*) AS num,-->
	307	+ <!--sum(-->
	308	+ <!--CASE in_hospit_result-->
	309	+ <!--WHEN 1 THEN-->
	310	+ <!--1-->
	311	+ <!--ELSE-->
	312	+ <!--0-->
	313	+ <!--END-->
	314	+ <!--) AS succNum,-->
	315	+ <!--sum(-->
	316	+ <!--CASE in_hospit_result-->
	317	+ <!--WHEN 2 THEN-->
	318	+ <!--1-->
	319	+ <!--ELSE-->
	320	+ <!--0-->
	321	+ <!--END-->
	322	+ <!--) AS errNum from-->
	323	+ <!--patient_mark_hospital-->
	324	+ <!--<include refid="PatientMarkHospitalCondition"/>-->
	325	+ <!--and in_hospit_doctor is not null-->
	326	+ <!--GROUP BY in_hospit_doctor;-->
	327	+ <!--</select>-->
328	328	<select id="reportPatMarkHospByInDoctor" resultType="com.lyms.platform.permission.model.ReportMakeHosptail"
329	329	parameterType="com.lyms.platform.permission.model.PatientMarkHospitalQuery">
330	330	SELECT

	1	+package com.lyms.hospitalapi.pojo;
	2	+
	3	+import java.util.List;
	4	+import java.util.Map;
	5	+
	6	+/**
	7	+ * @auther yangfei
	8	+ * @createTime 2017年09月27日 11时59分
	9	+ * @discription
	10	+ */
	11	+public class PieReportModel {
	12	+ /**
	13	+ *
	14	+ */
	15	+ public List<String> legendData;
	16	+ /** 数据列表 */
	17	+ private List<Map<String, Object>> seriesData;
	18	+
	19	+}

...	...	@@ -45,6 +45,20 @@
45	45	* @param request
46	46	* @return
47	47	*/
	48	+ @RequestMapping(value = "/reportHospit", method = {RequestMethod.POST, RequestMethod.GET})
	49	+ @ResponseBody
	50	+ @TokenRequired
	51	+ public BaseResponse reportHospit(PatientMarkRequest patientMarkRequest
	52	+ , HttpServletRequest request) {
	53	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	54	+ return patientMarkHospFacade.reportHospit(patientMarkRequest,loginState.getId());
	55	+ }
	56	+
	57	+ /**
	58	+ * 预约住院提醒列表
	59	+ * @param request
	60	+ * @return
	61	+ */
48	62	@RequestMapping(value = "/list", method = {RequestMethod.POST, RequestMethod.GET})
49	63	@ResponseBody
50	64	@TokenRequired

...	...	@@ -79,8 +79,11 @@
79	79	} else {
80	80	rm.setDoctorName("产检医生");
81	81	}
82		- rm.setOccupCompar(rm.getNum()/count);
83	82	}
	83	+
	84	+
	85	+
	86	+
84	87	return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(reportMakeHosptails);
85	88	}
86	89