jiangjiazhi / regional-platform

Commit c58508002aa2b33b8a4cb9c8dded8b14b7e54c4c

Authored by Administrator about 6 years ago

Exists in master and in 6 other branches

bug update

Showing 3 changed files with 88 additions and 74 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java
platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java

...	...	@@ -12,7 +12,7 @@
12	12	*
13	13	* @return
14	14	*/
15		- FolviteRecordModel queryOne(FolviteQuery query);
	15	+ List<FolviteRecordModel> queryOne(FolviteQuery query);
16	16
17	17	/**
18	18	* 保存叶酸建档记录
...	...	@@ -39,6 +39,7 @@
39	39
40	40	/**
41	41	* 查询总条数
	42	+ *
42	43	* @param query
43	44	* @return
44	45	*/

...	...	@@ -93,44 +93,7 @@
93	93
94	94	<select id="queryFolviteList" parameterType="com.lyms.platform.permission.model.FolviteQuery"
95	95	resultMap="folviteResultMap">
96		- SELECT
97		- id AS id,
98		- NAME AS NAME,
99		- sex AS sex,
100		- birthday AS birthday,
101		- nationality AS nationality,
102		- nation AS nation,
103		- marital_status AS maritalStatus,
104		- certificate_type AS certificateType,
105		- card_no AS cardNo,
106		- census_type AS censusType,
107		- live_type AS liveType,
108		- education AS education,
109		- occupation AS occupation,
110		- phone AS phone,
111		- work_unit AS workUnit,
112		- habitation_province AS habitationProvince,
113		- habitation_city AS habitationCity,
114		- habitation_area AS habitationArea,
115		- habitation_country AS habitationCountry,
116		- habitation_address AS habitationAddress,
117		- domicile_province AS domicileProvince,
118		- domicile_city AS domicileCity,
119		- domicile_area AS domicileArea,
120		- domicile_country AS domicileCountry,
121		- domicile_address AS domicileAddress,
122		- woman_id AS womanId,
123		- isconceive AS isconceive,
124		- lastmenstrual AS lastmenstrual,
125		- ispregnancy AS ispregnancy,
126		- operation_doctor AS operationDoctor,
127		- created AS created,
128		- vc_card AS vcCard,
129		- receivesum as receiveSum,
130		- hospitalid as hospitalId,
131		- drawTime as drawTime
132		- FROM
133		- lyms_folvite_Info
	96	+ SELECT * FROM lyms_folvite_Info
134	97	<include refid="whereSql"/>
135	98	<include refid="orderAndLimit"/>
136	99	</select>

...	...	@@ -24,6 +24,7 @@
24	24	import com.lyms.platform.query.ResidentsArchiveQuery;
25	25	import org.springframework.beans.factory.annotation.Autowired;
26	26	import org.springframework.stereotype.Service;
	27	+import org.springframework.util.ObjectUtils;
27	28
28	29	import java.util.*;
29	30
...	...	@@ -56,6 +57,7 @@
56	57	@Override
57	58	public BaseResponse queryFolvite(String vcCardNo, String cardNo, String certificateTypeId, Integer userId) {
58	59	Map<String, Object> response = new HashMap<>();
	60	+ boolean flag = true;
59	61	String hospitalId = autoMatchFacade.getHospitalId(userId);
60	62	FolviteQuery folviteQuery = new FolviteQuery();
61	63	ResidentsArchiveQuery query = new ResidentsArchiveQuery();
...	...	@@ -64,7 +66,7 @@
64	66	query.setVcCardNo(vcCardNo);
65	67	}
66	68	if (StringUtils.isNotEmpty(cardNo)) {
67		- folviteQuery.setVcCard(cardNo);
	69	+ folviteQuery.setCardNo(cardNo);
68	70	folviteQuery.setCertificateType(certificateTypeId);
69	71	query.setCertificateTypeId(certificateTypeId);
70	72	query.setCertificateNum(cardNo);
71	73
72	74
73	75
...	...	@@ -72,29 +74,69 @@
72	74	//未结束孕辰
73	75	folviteQuery.setIspregnancy(0);
74	76	folviteQuery.setHospitalId(hospitalId);
75		- FolviteRecordModel queryOne = folviteMapper.queryOne(folviteQuery);
	77	+ List<FolviteRecordModel> recordModels = folviteMapper.queryOne(folviteQuery);
76	78	Map<String, Object> data = new HashMap<>();
77		- if (null != queryOne) {
78		- data.put("id", queryOne.getId());
79		- data.put("name", queryOne.getName());
80		- data.put("age", DateUtil.getAge(queryOne.getBirthday()));
81		- data.put("sex", queryOne.getSex());
82		- data.put("birth", DateUtil.getyyyy_MM_dd(queryOne.getBirthday()));
83		- data.put("phone", queryOne.getPhone());
84		- data.put("address", CommonsHelper.getResidence(queryOne.getDomicileProvince(), queryOne.getDomicileCity(),
85		- queryOne.getDomicileArea(), queryOne.getDomicileCountry(), queryOne.getDomicileAddress(), basicConfigService));
	79	+ String womanId = null;
	80	+ if (CollectionUtils.isNotEmpty(recordModels)) {
	81	+ FolviteRecordModel queryOne = recordModels.get(0);
	82	+ if (null != queryOne) {
	83	+ data.put("id", queryOne.getId());
	84	+ data.put("name", queryOne.getName());
	85	+ data.put("age", DateUtil.getAge(queryOne.getBirthday()));
	86	+ data.put("sex", queryOne.getSex());
	87	+ data.put("birth", DateUtil.getyyyy_MM_dd(queryOne.getBirthday()));
	88	+ data.put("phone", queryOne.getPhone());
	89	+ data.put("address", CommonsHelper.getResidence(queryOne.getDomicileProvince(), queryOne.getDomicileCity(),
	90	+ queryOne.getDomicileArea(), queryOne.getDomicileCountry(), queryOne.getDomicileAddress(), basicConfigService));
	91	+ flag = false;
	92	+ womanId = queryOne.getWomanId();
	93	+ }
86	94	}
87		- //如果为空查询孕妇档案进行叶酸档案建档回显孕妇档案数据回去
88		- query.setSex(SystemConfig.WOMAN_ID);
89		- query.setYn(YnEnums.YES.getId());
90		- query.setHospitalId(hospitalId);
91		- List<ResidentsArchiveModel> archiveModels = residentsArchiveService.queryResident(query);
92		- if (CollectionUtils.isEmpty(archiveModels)) {
93		- return new BaseResponse().setErrormsg("为妇女建档,请先建档案!").setErrorcode(1);
	95	+ /* FolviteQuery queryFolvite = new FolviteQuery();
	96	+ queryFolvite.setWomanId(womanId);
	97	+ queryFolvite.setCardNo(cardNo);
	98	+ List<FolviteRecordModel> recordModel = queryFolviteList(queryFolvite);
	99	+ List<List<Map<String, Object>>> list = new ArrayList();
	100	+ if (CollectionUtils.isNotEmpty(recordModel)) {
	101	+ FolviteRecordQuery recordQuery = new FolviteRecordQuery();
	102	+ for (FolviteRecordModel folviteModel : recordModel) {
	103	+ List<Map<String, Object>> listMap = new ArrayList<>();
	104	+ recordQuery.setFolviteId(folviteModel.getId());
	105	+ List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
	106	+ if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
	107	+ for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
	108	+ Map<String, Object> recordMap = new HashMap<>();
	109	+ recordMap.put("drawCount", folviteRecordModel.getReceiveNumber());
	110	+ recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate()));
	111	+ recordMap.put("id", folviteRecordModel.getId());
	112	+ recordMap.put("other", folviteRecordModel.getIsconceive());
	113	+ if (folviteRecordModel.getIsconceive() == 0) {
	114	+ recordMap.put("pregnancyType", "孕前");
	115	+ } else {
	116	+ recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周");
	117	+ }
	118	+ listMap.add(recordMap);
	119	+ }
	120	+ }
	121	+ list.add(listMap);
	122	+ }
	123	+ }*/
	124	+
	125	+ FolviteResult result = null;
	126	+ if (flag) {
	127	+ //如果为空查询孕妇档案进行叶酸档案建档回显孕妇档案数据回去
	128	+ query.setSex(SystemConfig.WOMAN_ID);
	129	+ query.setYn(YnEnums.YES.getId());
	130	+ query.setHospitalId(hospitalId);
	131	+ List<ResidentsArchiveModel> archiveModels = residentsArchiveService.queryResident(query);
	132	+ if (CollectionUtils.isEmpty(archiveModels)) {
	133	+ return new BaseResponse().setErrormsg("为妇女建档,请先建档案!").setErrorcode(1);
	134	+ }
	135	+ //获取最新的档案
	136	+ ResidentsArchiveModel archiveModel = archiveModels.get(0);
	137	+ result = result(archiveModel);
94	138	}
95		- //获取最新的档案
96		- ResidentsArchiveModel archiveModel = archiveModels.get(0);
97		- FolviteResult result = result(archiveModel);
	139	+
98	140	BaseResponse responses = new BaseResponse();
99	141	response.put("baseInfo", data);
100	142	response.put("history", "历史记录");
101	143
102	144
103	145
...	...	@@ -167,25 +209,31 @@
167	209	FolviteQuery folviteQuery = new FolviteQuery();
168	210	folviteQuery.setHospitalId(hospitalId);
169	211	folviteQuery.setId(folviteId);
170		- FolviteRecordModel recordModel = folviteMapper.queryOne(folviteQuery);
	212	+ List<FolviteRecordModel> folviteRecordModels1 = folviteMapper.queryOne(folviteQuery);
171	213	String womanId = null;
	214	+ String cardNo = null;
172	215	Map<String, Object> folvite = new HashMap<>();
173		- if (recordModel != null) {
174		- folvite.put("username", recordModel.getName());
175		- folvite.put("birthday", DateUtil.getyyyy_MM_dd(recordModel.getBirthday()));
176		- folvite.put("certificateNum", recordModel.getCardNo());
177		- folvite.put("certificateTypeId", recordModel.getCertificateType());
178		- folvite.put("id", recordModel.getId());
179		- folvite.put("phone", recordModel.getPhone());
180		- folvite.put("residenceRegister", CommonsHelper.getResidence(recordModel.getDomicileProvince(), recordModel.getDomicileCity(),
181		- recordModel.getDomicileArea(), recordModel.getDomicileCountry(), recordModel.getDomicileAddress(), basicConfigService));
182		- folvite.put("alreadySum", "已领总数");
183		- folvite.put("canSum", "可领总数");
184		- womanId = recordModel.getWomanId();
	216	+ if (CollectionUtils.isNotEmpty(folviteRecordModels1)) {
	217	+ FolviteRecordModel recordModel = folviteRecordModels1.get(0);
	218	+
	219	+ if (recordModel != null) {
	220	+ folvite.put("username", recordModel.getName());
	221	+ folvite.put("birthday", DateUtil.getyyyy_MM_dd(recordModel.getBirthday()));
	222	+ folvite.put("certificateNum", recordModel.getCardNo());
	223	+ folvite.put("certificateTypeId", recordModel.getCertificateType());
	224	+ folvite.put("id", recordModel.getId());
	225	+ folvite.put("phone", recordModel.getPhone());
	226	+ folvite.put("residenceRegister", CommonsHelper.getResidence(recordModel.getDomicileProvince(), recordModel.getDomicileCity(),
	227	+ recordModel.getDomicileArea(), recordModel.getDomicileCountry(), recordModel.getDomicileAddress(), basicConfigService));
	228	+ folvite.put("alreadySum", "已领总数");
	229	+ folvite.put("canSum", "可领总数");
	230	+ womanId = recordModel.getWomanId();
	231	+ cardNo = recordModel.getCardNo();
	232	+ }
185	233	}
186	234	FolviteQuery query = new FolviteQuery();
187	235	query.setWomanId(womanId);
188		- query.setCardNo(recordModel.getCardNo());
	236	+ query.setCardNo(cardNo);
189	237	List<FolviteRecordModel> recordModels = queryFolviteList(query);
190	238	List<List<Map<String, Object>>> list = new ArrayList();
191	239	if (CollectionUtils.isNotEmpty(recordModels)) {
...	...	@@ -238,6 +286,8 @@
238	286
239	287	@Override
240	288	public List<FolviteRecordModel> list(FolviteQuery folviteQuery) {
	289	+
	290	+
241	291	return null;
242	292	}
243	293