jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 7 changed files with 19 additions and 9 deletions

...	...	@@ -47,7 +47,6 @@
47	47	@Autowired
48	48	private TrackDownRecordService trackDownRecordService;
49	49
50		-
51	50	public Patients addPatient(Patients obj) {
52	51	return iPatientDao.addPatient(obj);
53	52	}

...	...	@@ -20,7 +20,7 @@
20	20
21	21	public List<HospitalServiceContent> queryGroupHospitalServiceContent(HospitalServiceContentQuery query);
22	22
23		- public int queryGroupHospitalServiceContentCount(HospitalServiceContentQuery query);
	23	+ public Integer queryGroupHospitalServiceContentCount(HospitalServiceContentQuery query);
24	24
25	25	}

...	...	@@ -51,7 +51,8 @@
51	51	@Override
52	52	public List<HospitalServiceContent> queryGroupHospitalServiceContent(HospitalServiceContentQuery query) {
53	53	if (query.getNeed() != null) {
54		- query.mysqlBuild(hospitalServiceContentMapper.queryGroupHospitalServiceContentCount(query));
	54	+ Integer count = hospitalServiceContentMapper.queryGroupHospitalServiceContentCount(query);
	55	+ query.mysqlBuild(count==null?0:count);
55	56	}
56	57	return hospitalServiceContentMapper.queryGroupHospitalServiceContent(query);
57	58	}

...	...	@@ -110,7 +110,7 @@
110	110	<include refid="orderAndLimit"/>
111	111	</select>
112	112
113		- <select id="queryGroupHospitalServiceContentCount" resultType="int"
	113	+ <select id="queryGroupHospitalServiceContentCount" resultType="INTEGER"
114	114	parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
115	115	select count(1) from hospital_service_content
116	116	<include refid="HospitalServiceContentCondition"/>

...	...	@@ -2618,7 +2618,7 @@
2618	2618	return new BaseObjectResponse().setData(object).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
2619	2619	}
2620	2620
2621		- private List<Map<String, Object>> getscreenResult(List<String> screenResult) {
	2621	+ public List<Map<String, Object>> getscreenResult(List<String> screenResult) {
2622	2622	List<Map<String, Object>> list = new ArrayList<>();
2623	2623	if (CollectionUtils.isNotEmpty(screenResult)) {
2624	2624	BasicConfigQuery basicConfigQuery = new BasicConfigQuery();

...	...	@@ -65,7 +65,6 @@
65	65	private BabyCheckFacade babyCheckFacade;
66	66	@Autowired
67	67	private OrganizationGroupsFacade groupsFacade;
68		-
69	68	@Autowired
70	69	private OperateLogFacade operateLogFacade;
71	70	@Autowired
...	...	@@ -455,8 +454,6 @@
455	454	}
456	455
457	456	referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname);
458		-
459		-
460	457	referralApplyOrderResult.setTransferredHospital(map1);
461	458
462	459	Map map = new HashMap();
...	...	@@ -469,6 +466,10 @@
469	466	}
470	467
471	468	referralApplyOrderResult.setApplyDoctor(map);
	469	+
	470	+
	471	+ List<Map<String, Object>> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult());
	472	+ referralApplyOrderResult.setScreenResult(screenList);
472	473
473	474	}
474	475	return new BaseObjectResponse().setData(referralApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");

...	...	@@ -50,7 +50,8 @@
50	50	private Map transferredHospital;
51	51	//转出医院id
52	52	private String outHospitalId;
53		-
	53	+ //筛查结果
	54	+ private List<Map<String, Object>> screenResult;
54	55	//转入科室
55	56	private String transferredDepartment;
56	57	//病情描述
...	...	@@ -67,6 +68,14 @@
67	68	private String zhuanCName;
68	69	//转入医院
69	70	private String zhuanRname;
	71	+
	72	+ public List<Map<String, Object>> getScreenResult() {
	73	+ return screenResult;
	74	+ }
	75	+
	76	+ public void setScreenResult(List<Map<String, Object>> screenResult) {
	77	+ this.screenResult = screenResult;
	78	+ }
70	79
71	80	public String getPid() {
72	81	return pid;