jiangjiazhi / regional-platform

Commit 192e64d1120a1ef43f74ffdd3feedee6ac4f300d

Authored by [wangbo] almost 6 years ago

Exists in master and in 6 other branches

儿童快捷测量

Showing 8 changed files with 89 additions and 13 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterUsersMapper.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java
platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml
platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java

...	...	@@ -3,6 +3,8 @@
3	3	import com.lyms.platform.permission.model.UserScore;
4	4	import com.lyms.platform.permission.model.Users;
5	5	import com.lyms.platform.permission.model.UsersQuery;
	6	+import org.apache.ibatis.annotations.Param;
	7	+import org.springframework.web.bind.annotation.RequestParam;
6	8
7	9	import java.util.List;
8	10
9	11
...	...	@@ -16,9 +18,11 @@
16	18	public Users getUsers(Integer id);
17	19
18	20	public int queryUsersCount(UsersQuery query);
	21	+
19	22	public int queryUsersCount2(UsersQuery query);
20	23
21	24	public List<Users> queryUsers(UsersQuery query);
	25	+
22	26	public List<Users> queryUsers2(UsersQuery query);
23	27
24	28	public List<Users> getUsersByLoginCenterId(Integer id);
...	...	@@ -27,5 +31,8 @@
27	31	void addUserScore(UserScore userScore);
28	32
29	33	Integer findUserAvgScore(Integer userId);
	34	+
	35	+ Integer getUserId(@Param("orgId") String orgId, @Param("doctorName") String name);
	36	+
30	37	}

...	...	@@ -26,5 +26,7 @@
26	26	void addUserScore(UserScore userScore);
27	27
28	28	Integer findUserAvgScore(Integer i);
	29	+
	30	+ Integer getUserId(String hospitalId, String doctorName);
29	31	}

...	...	@@ -110,7 +110,15 @@
110	110
111	111	@Override
112	112	public Integer findUserAvgScore(Integer userId) {
113		- return usersMapper.findUserAvgScore(userId);
	113	+ return usersMapper.findUserAvgScore(userId);
	114	+
114	115	}
	116	+
	117	+ @Override
	118	+ public Integer getUserId(String hospitalId, String doctorName) {
	119	+ return usersMapper.getUserId(hospitalId, doctorName);
	120	+ }
	121	+
	122	+
115	123	}

...	...	@@ -337,5 +337,10 @@
337	337	WHERE user_id=#{userId}
338	338	</select>
339	339
	340	+ <select id="getUserId" resultType="java.lang.Integer">
	341	+ select id from users where org_id=#{orgId} and name=#{doctorName}
	342	+
	343	+ </select>
	344	+
340	345	</mapper>

...	...	@@ -198,7 +198,7 @@
198	198	res[i] = addr.charAt(i);
199	199	}
200	200
201		- for (int i = addr.indexOf("市")+1; i < chars.length; i++) {
	201	+ for (int i = addr.indexOf("市") + 1; i < chars.length; i++) {
202	202	res[i] = '*';
203	203	}
204	204	return new String(res);
...	...	@@ -208,7 +208,7 @@
208	208	}
209	209	}
210	210	return addr;
211		-}
	211	+ }
212	212
213	213	/**
214	214	* 证件号加密处理
215	215
216	216
217	217
...	...	@@ -281,16 +281,16 @@
281	281	}
282	282
283	283
284		- public static String replaceName(String name, String repalceStr,String doctor) {
	284	+ public static String replaceName(String name, String repalceStr, String doctor) {
285	285	if (StringUtils.isNotEmpty(repalceStr)) {
286		- return repalceStr.replace("{{姓名}}", name).replace("{{医生名称}}",doctor);
	286	+ return repalceStr.replace("{{姓名}}", name).replace("{{医生名称}}", doctor);
287	287	}
288	288	return repalceStr;
289	289	}
290	290
291		- public static String replaceNameRisk(String name, String risk,String repalceStr,String doctor) {
	291	+ public static String replaceNameRisk(String name, String risk, String repalceStr, String doctor) {
292	292	if (StringUtils.isNotEmpty(repalceStr)) {
293		- return repalceStr.replace("{{姓名}}", name).replace("{{高危因素}}", risk).replace("{{医生名称}}",doctor);
	293	+ return repalceStr.replace("{{姓名}}", name).replace("{{高危因素}}", risk).replace("{{医生名称}}", doctor);
294	294	}
295	295	return repalceStr;
296	296	}
...	...	@@ -305,7 +305,7 @@
305	305
306	306
307	307	public static String unitHandle(Object value, String unit) {
308		- if (value==null \|\| "/".equals(value)){
	308	+ if (value == null \|\| "/".equals(value)) {
309	309	return null;
310	310	}
311	311	return value.toString() + unit;
...	...	@@ -323,6 +323,7 @@
323	323	}
324	324	return list;
325	325	}
	326	+
326	327	// public static void main(String[] arg) {
327	328	// System.out.print(encryPhone("18382670036"));
328	329	// }

...	...	@@ -8,6 +8,7 @@
8	8	import com.lyms.platform.operate.web.facade.MeasureInfoFacade;
9	9	import com.lyms.platform.operate.web.facade.TempFacade;
10	10	import com.lyms.platform.operate.web.request.*;
	11	+import com.lyms.platform.permission.service.UsersService;
11	12	import com.lyms.platform.pojo.BloodSugar;
12	13	import org.springframework.beans.factory.annotation.Autowired;
13	14	import org.springframework.stereotype.Controller;
...	...	@@ -30,6 +31,7 @@
30	31
31	32	@Autowired
32	33	private TempFacade tempFacade;
	34	+
33	35
34	36	/**
35	37	* 血糖和脉搏身高和体重的值列表

...	...	@@ -1383,5 +1383,6 @@
1383	1383	objectResponse.setErrormsg("成功");
1384	1384	return objectResponse;
1385	1385	}
	1386	+
1386	1387	}

...	...	@@ -12,10 +12,7 @@
12	12	import com.lyms.platform.common.utils.DateUtil;
13	13	import com.lyms.platform.common.utils.ExceptionUtils;
14	14	import com.lyms.platform.common.utils.JsonUtil;
15		-import com.lyms.platform.operate.web.request.MeasureAllInfoRequest;
16		-import com.lyms.platform.operate.web.request.MeasureBabyInfoRequest;
17		-import com.lyms.platform.operate.web.request.MeasureInfoRequest;
18		-import com.lyms.platform.operate.web.request.NutritionInfoRequest;
	15	+import com.lyms.platform.operate.web.request.*;
19	16	import com.lyms.platform.operate.web.result.MeasureBaseInfoResult;
20	17	import com.lyms.platform.operate.web.result.MeasureInfoResult;
21	18	import com.lyms.platform.operate.web.service.PatientWeightService;
...	...	@@ -27,6 +24,7 @@
27	24	import com.lyms.platform.permission.service.MeasureDataInfoService;
28	25	import com.lyms.platform.permission.service.MeasureUserInfoService;
29	26	import com.lyms.platform.permission.service.OrganizationService;
	27	+import com.lyms.platform.permission.service.UsersService;
30	28	import com.lyms.platform.pojo.*;
31	29	import com.lyms.platform.query.*;
32	30	import net.sf.json.JSONObject;
33	31
...	...	@@ -93,8 +91,13 @@
93	91	@Autowired
94	92	private AutoMatchFacade autoMatchFacade;
95	93
	94	+ @Autowired
	95	+ private UsersService usersService;
96	96
97	97	@Autowired
	98	+ private BabyBookbuildingFacade babyBookbuildingFacade;
	99	+
	100	+ @Autowired
98	101	private ArchiveDataServicer archiveDataServicer;
99	102
100	103	private static String[] blood_item = new String[]{"--", "--", "--", "--", "--", "--", "--", "--", "--"};
101	104
102	105
103	106
104	107
105	108
...	...	@@ -1424,18 +1427,65 @@
1424	1427
1425	1428	public BaseObjectResponse getBabyMeasureInfo(String certType, String certNo, String hospitalId) {
1426	1429	BaseObjectResponse br = new BaseObjectResponse();
	1430	+ Criteria criteria = Criteria.where("yn").ne(0);
1427	1431	BabyModelQuery query = new BabyModelQuery();
1428	1432	query.setHospitalId(hospitalId);
1429	1433	query.setYn(YnEnums.YES.getId());
1430	1434	if ("2".equals(certType)) {
1431	1435	query.setVcCardNo(certNo);
	1436	+ criteria.and("vcCardNo").is(certNo);
1432	1437	} else {
1433	1438	//通过母亲身份证或者电话查询
	1439	+ criteria.orOperator(Criteria.where("mommyCertificateNum").is(certNo), Criteria.where("mommyPhone").is(certNo));
1434	1440	query.setQueryNo(certNo);
1435	1441	}
1436		-
1437	1442	List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(query);
	1443	+ Integer userId = usersService.getUserId(hospitalId, "快捷建档");
	1444	+ List<BabyAppointmentBuildModel> babyAppointmentBuildModels = null;
1438	1445	if (CollectionUtils.isEmpty(models)) {
	1446	+ babyAppointmentBuildModels = mongoTemplate.find(Query.query(criteria), BabyAppointmentBuildModel.class);
	1447	+ if (CollectionUtils.isNotEmpty(babyAppointmentBuildModels)) {
	1448	+ Map data = new HashMap();
	1449	+ List<Map> babies = new ArrayList<>();
	1450	+ Map mother = new HashMap();
	1451	+ for (BabyAppointmentBuildModel buildModel : babyAppointmentBuildModels) {
	1452	+ BabyBookbuildingAddRequest bookbuildingAddRequest = new BabyBookbuildingAddRequest();
	1453	+ if (buildModel != null) {
	1454	+ bookbuildingAddRequest.setBabyName(buildModel.getBabyName());
	1455	+ bookbuildingAddRequest.setMommyName(buildModel.getMommyName());
	1456	+ bookbuildingAddRequest.setMommyCertificateNum(buildModel.getMommyCertificateNum());
	1457	+ bookbuildingAddRequest.setMommyPhone(buildModel.getMommyPhone());
	1458	+ bookbuildingAddRequest.setMommyCertificateTypeId(buildModel.getMommyCertificateTypeId());
	1459	+ bookbuildingAddRequest.setSex(buildModel.getBabyGender());
	1460	+ bookbuildingAddRequest.setBabyBirthday(DateUtil.getyyyy_MM_dd(buildModel.getBabyBirthday()));
	1461	+ bookbuildingAddRequest.setVcCardNo(buildModel.getVcCardNo());
	1462	+ bookbuildingAddRequest.setHospitalId(hospitalId);
	1463	+ BaseObjectResponse response = babyBookbuildingFacade.addBabyBookbuilding(bookbuildingAddRequest, userId);
	1464	+ if (response.getErrorcode() != 0) {
	1465	+ return br.setErrormsg("建档不成功!");
	1466	+ }
	1467	+ mother.put("motherCardNo", buildModel.getMommyCertificateNum());
	1468	+ mother.put("motherPhone", buildModel.getMommyPhone());
	1469	+ mother.put("motherName", buildModel.getMommyName());
	1470	+ mother.put("motherAge", com.lyms.platform.common.utils.StringUtils.getBirthDay(buildModel.getMommyCertificateNum()));
	1471	+ Map map = new HashMap();
	1472	+ if (response.getErrorcode() == 0) {
	1473	+ map.put("id", response.getData().toString());
	1474	+ }
	1475	+ map.put("babyName", buildModel.getBabyName());
	1476	+ map.put("sex", SexEnum.getTextById(buildModel.getBabyGender()));
	1477	+ map.put("birth", DateUtil.getyyyy_MM_dd(buildModel.getBabyBirthday()));
	1478	+ map.put("vcCardNo", buildModel.getVcCardNo());
	1479	+ babies.add(map);
	1480	+ }
	1481	+ }
	1482	+ data.put("babies", babies);
	1483	+ data.put("mother", mother);
	1484	+ br.setData(data);
	1485	+ return br;
	1486	+ }
	1487	+ }
	1488	+ if (CollectionUtils.isEmpty(models) && CollectionUtils.isEmpty(babyAppointmentBuildModels)) {
1439	1489	br.setErrorcode(ErrorCodeConstants.USER_NOT_EXISTS);
1440	1490	br.setErrormsg("没有儿童档案，请到儿童中心创建档案");
1441	1491	return br;