jiangjiazhi / regional-platform

Commit 3cfd09e6cbf99d4463257fffc1b484a6dfcc82b0

Authored by zhangchao over 1 year ago

Exists in dev

#fix:新增高危专号、建档统计

Showing 18 changed files with 566 additions and 36 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/JdStatisticsQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java

...	...	@@ -41,6 +41,8 @@
41	41
42	42	List<HashMap> aggregateOne(MongoQuery mongoQuery);
43	43
	44	+ List<HashMap> aggregatbookbuildingDoctore(MongoQuery mongoQuery);
	45	+
44	46	public void updatePatientHusbandBirth(String id, Object colValue);
45	47
46	48	List<HashMap> queryPatientAnxtchuCount(MongoQuery query);

...	...	@@ -166,5 +166,16 @@
166	166	AggregationResults<HashMap> result = mongoTemplate.aggregate(aggregation, "lyms_patient", HashMap.class);
167	167	return result.getMappedResults();
168	168	}
	169	+
	170	+ public List<HashMap> aggregatbookbuildingDoctore(MongoQuery mongoQuery) {
	171	+ AggregationOperation match = Aggregation.match(mongoQuery.getCriteria());
	172	+ AggregationOperation group = Aggregation.group("bookbuildingDoctor").count().as("count");
	173	+
	174	+ Aggregation aggregation = Aggregation.newAggregation(match, group);
	175	+
	176	+ AggregationResults<HashMap> result = mongoTemplate.aggregate(aggregation, "lyms_patient", HashMap.class);
	177	+ return result.getMappedResults();
	178	+ }
	179	+
169	180	}

...	...	@@ -82,6 +82,11 @@
82	82	iPatientDao.findAndModify(query.convertToQuery(), obj);
83	83	}
84	84
	85	+ public List aggregatbookbuildingDoctore(PatientsQuery patientsQuery){
	86	+ MongoQuery query = patientsQuery.convertToQuery();
	87	+ return iPatientDao.aggregatbookbuildingDoctore(query);
	88	+ }
	89	+
85	90	public List aggregateOne(PatientsQuery patientsQuery) {
86	91	MongoQuery query = patientsQuery.convertToQuery();
87	92	if (StringUtils.isNotEmpty(patientsQuery.getNeed())) {

...	...	@@ -108,7 +108,7 @@
108	108	//建档日期
109	109	private Date bookbuildingDate;
110	110
111		- //高危专案档案号
	111	+ //高危专案档案号大同
112	112	private String highRiskFileCode;
113	113
114	114	//医院ID
...	...	@@ -504,6 +504,7 @@
504	504	private String glufour;//120分钟血糖
505	505	//产筛结果
506	506	private String nipt;//唐氏筛查/无创DNA检测
	507	+
507	508
508	509	public String getGlucm() {
509	510	return glucm;

...	...	@@ -433,9 +433,21 @@
433	433	private Integer isComplete;
434	434
435	435	private String serviceTime;
	436	+ //大同高危专号
	437	+ private String highRiskFileCode;
436	438
	439	+ private String nebookbuildingDoctor;
	440	+
437	441	private Map<String,Date> mapTime;
438	442
	443	+ public String getNebookbuildingDoctor() {
	444	+ return nebookbuildingDoctor;
	445	+ }
	446	+
	447	+ public void setNebookbuildingDoctor(String nebookbuildingDoctor) {
	448	+ this.nebookbuildingDoctor = nebookbuildingDoctor;
	449	+ }
	450	+
439	451	public String getServiceTime() {
440	452	return serviceTime;
441	453	}
...	...	@@ -687,6 +699,14 @@
687	699	this.streetRegisterIds = streetRegisterIds;
688	700	}
689	701
	702	+ public String getHighRiskFileCode() {
	703	+ return highRiskFileCode;
	704	+ }
	705	+
	706	+ public void setHighRiskFileCode(String highRiskFileCode) {
	707	+ this.highRiskFileCode = highRiskFileCode;
	708	+ }
	709	+
690	710	public MongoQuery convertToQuery() {
691	711	MongoCondition condition = MongoCondition.newInstance();
692	712
...	...	@@ -731,6 +751,10 @@
731	751	condition = condition.and("isHistory", false, MongoOper.EXISTS);
732	752	}
733	753
	754	+ if (StringUtils.isNotEmpty(highRiskFileCode)){
	755	+ condition = condition.and("highRiskFileCode", highRiskFileCode, MongoOper.IS);
	756	+ }
	757	+
734	758	if (null != isComplete) {
735	759	condition = condition.and("isComplete", isComplete, MongoOper.IS);
736	760	}
...	...	@@ -840,6 +864,11 @@
840	864	if (bookbuildingDoctor != null) {
841	865	condition = condition.and("bookbuildingDoctor", bookbuildingDoctor, MongoOper.IS);
842	866	}
	867	+
	868	+ if (null != nebookbuildingDoctor) {
	869	+ condition = condition.and("bookbuildingDoctor", null, MongoOper.NE);
	870	+ }
	871	+
843	872	if (CollectionUtils.isNotEmpty(bookbuildingDoctorList)) {
844	873	condition = condition.and("bookbuildingDoctor", bookbuildingDoctorList, MongoOper.IN);
845	874	}

...	...	@@ -12,7 +12,9 @@
12	12	import com.lyms.platform.common.utils.SystemConfig;
13	13	import com.lyms.platform.operate.web.facade.AntExRecordFacade;
14	14	import com.lyms.platform.operate.web.facade.BasicConfigFacade;
	15	+import com.lyms.platform.operate.web.facade.PatientServiceFacade;
15	16	import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest;
	17	+import com.lyms.platform.operate.web.request.JdStatisticsQueryRequest;
16	18	import com.lymsh.platform.reportdata.model.AreaData;
17	19	import com.lymsh.platform.reportdata.model.AreaDataQuery;
18	20	import com.lymsh.platform.reportdata.model.echarts.*;
...	...	@@ -42,6 +44,8 @@
42	44	private AntExRecordFacade antExRecordFacade;
43	45	@Autowired
44	46	private BasicConfigFacade basicConfigFacade;
	47	+ @Autowired
	48	+ private PatientServiceFacade patientServiceFacade;
45	49
46	50
47	51
...	...	@@ -1178,6 +1182,14 @@
1178	1182	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
1179	1183	return antExRecordFacade.queryStatis(loginState.getId(),statisticsQueryRequest);
1180	1184	}
	1185	+ @RequestMapping(value = "/jdStatistics", method = RequestMethod.GET)
	1186	+ @ResponseBody
	1187	+ @TokenRequired
	1188	+ public BaseResponse jdStatistics(HttpServletRequest request, @Valid JdStatisticsQueryRequest jdStatisticsQueryRequest){
	1189	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	1190	+ return patientServiceFacade.queryStatistics(loginState.getId(),jdStatisticsQueryRequest);
	1191	+ }
	1192	+
1181	1193	@RequestMapping(value = "/cjStatistics/enums", method = RequestMethod.GET)
1182	1194	@ResponseBody
1183	1195	@TokenRequired

...	...	@@ -410,8 +410,10 @@
410	410	public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage, boolean isCurrent) { String hospitalId = autoMatchFacade.getHospitalId(userId);
411	411	PatientsQuery patientsQuery = new PatientsQuery();
412	412	List<Patients> patientses = null;
413		- if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) {
	413	+ if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo()) \|\| StringUtils.isNotEmpty(antExManagerQueryRequest.getHighRiskFileCode())) {
	414	+
414	415	patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo());
	416	+ patientsQuery.setHighRiskFileCode(antExManagerQueryRequest.getHighRiskFileCode());
415	417	patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified");
416	418
417	419	if (CollectionUtils.isEmpty(patientses)) {
...	...	@@ -427,6 +429,8 @@
427	429	}
428	430	}
429	431
	432	+
	433	+
430	434	//威县数据流转
431	435	if(OrganizationConstant.XT_WX.equals(hospitalId)){
432	436	antExManagerQueryRequest.setCheckDoctor(String.valueOf(userId));
...	...	@@ -941,7 +945,9 @@
941	945	}
942	946	}
943	947	} else {
944		- antExRecordQuery.setNeNullCheckDoctor(true);
	948	+ if(!StringUtils.isNotEmpty(statisticsQueryRequest.getdId())){
	949	+ antExRecordQuery.setNeNullCheckDoctor(true);
	950	+ }
945	951	List<HashMap> list = recordService.aggregateOne(antExRecordQuery);
946	952	for (HashMap map : list) {
947	953	CjStatisticsResult cjStatisticsResult = new CjStatisticsResult();

...	...	@@ -289,6 +289,20 @@
289	289	}
290	290	}
291	291	}
	292	+ if (StringUtils.isNotEmpty(yunRequest.getHighRiskFileCode())){
	293	+ patientsQuery.setCardNo(null);
	294	+ patientsQuery.setPhone(null);
	295	+ patientsQuery.setHighRiskFileCode(yunRequest.getHighRiskFileCode());
	296	+ //判断该手机号码在孕期内有没有建档
	297	+ List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
	298	+ if (yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")) {//todowtt
	299	+ if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) {
	300	+ br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
	301	+ br.setErrormsg("该高危专号已存在");
	302	+ return br;
	303	+ }
	304	+ }
	305	+ }
292	306
293	307	//就诊卡号判断
294	308	// if (StringUtils.isNotEmpty(yunRequest.getVcCardNo())) {
...	...	@@ -380,6 +394,38 @@
380	394	patient.setOperator(userId);
381	395	patient.setScreening(yunRequest.getScreening());//特殊产筛建档
382	396
	397	+ //如果建档医生是空则创建医生
	398	+ if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())){
	399	+
	400	+ Integer dockerId= usersService.getUserId(patient.getHospitalId(),yunRequest.getLastCheckEmployeeName());
	401	+ if (dockerId!=null){
	402	+ patient.setLastCheckEmployeeId(String.valueOf(dockerId));
	403	+ }else {
	404	+ //准备添加数据
	405	+ Users users = new Users();
	406	+ users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户
	407	+ //users.setDeptId(deptId);
	408	+ users.setOrgId(Integer.valueOf(patient.getHospitalId()));
	409	+ users.setName(yunRequest.getLastCheckEmployeeName());
	410	+ users.setAccount(yunRequest.getLastCheckEmployeeName());
	411	+ //users.setPhone(phone);
	412	+ users.setEnable(1);
	413	+ // users.setZhiChenId(zhiCId);
	414	+ users.setPwd(MD5Utils.md5("123456").toUpperCase());
	415	+ //users.setRemarks(remarks);
	416	+ // users.setKsId(ksId);
	417	+ // users.setPublishId(user.getId());
	418	+ // users.setPublishName(user.getName());
	419	+ users.setYn(YnEnums.YES.getId());
	420	+ users.setModified(new Date());
	421	+ users.setCreated(new Date());
	422	+ // users.setZhiChen(ZhiChenEnums.getById(zhiCId));
	423	+ // user.setDefaultPage(defaultPage);
	424	+ usersService.addUsers(users);
	425	+ patient.setLastCheckEmployeeId(String.valueOf(users.getId()));
	426	+ }
	427	+ }
	428	+
383	429	//生成条形码
384	430	getNumberCode(patient);
385	431	getTrackHospital(patient);
...	...	@@ -1539,7 +1585,22 @@
1539	1585	}
1540	1586	}
1541	1587	}
1542		-
	1588	+ if (StringUtils.isNotEmpty(yunRequest.getHighRiskFileCode())) {
	1589	+ if (pat != null){
	1590	+ if(StringUtils.isEmpty(pat.getHighRiskFileCode()) \|\|!yunRequest.getHighRiskFileCode().equals(pat.getHighRiskFileCode())) {
	1591	+ patientsQuery.setCardNo(null);
	1592	+ patientsQuery.setPhone(null);
	1593	+ patientsQuery.setHighRiskFileCode(yunRequest.getHighRiskFileCode());
	1594	+ //判断该手机号码在孕期内有没有建档
	1595	+ patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
	1596	+ if (CollectionUtils.isNotEmpty(patients)) {
	1597	+ br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
	1598	+ br.setErrormsg("该高危专号已存在");
	1599	+ return br;
	1600	+ }
	1601	+ }
	1602	+ }
	1603	+ }
1543	1604	// if (pat != null && StringUtils.isNotEmpty(pat.getVcCardNo()) && !pat.getVcCardNo().equals(yunRequest.getVcCardNo())) {
1544	1605	//
1545	1606	// //就诊卡号判断
...	...	@@ -1560,6 +1621,8 @@
1560	1621	}
1561	1622
1562	1623
	1624	+
	1625	+
1563	1626	Patients patient = getPatientsData(yunRequest);
1564	1627	patient.setYyzyfmHospitalId(yunRequest.getYyzyfmHospitalId());
1565	1628	patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime()));
...	...	@@ -1616,6 +1679,38 @@
1616	1679	}
1617	1680	}*/
1618	1681
	1682	+ //如果建档医生是空则创建医生
	1683	+ if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())){
	1684	+
	1685	+ Integer dockerId= usersService.getUserId(patient.getHospitalId(),yunRequest.getLastCheckEmployeeName());
	1686	+ if (dockerId!=null){
	1687	+ patient.setLastCheckEmployeeId(String.valueOf(dockerId));
	1688	+ }else {
	1689	+ //准备添加数据
	1690	+ Users users = new Users();
	1691	+ users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户
	1692	+ //users.setDeptId(deptId);
	1693	+ users.setOrgId(Integer.valueOf(patient.getHospitalId()));
	1694	+ users.setName(yunRequest.getLastCheckEmployeeName());
	1695	+ users.setAccount(yunRequest.getLastCheckEmployeeName());
	1696	+ //users.setPhone(phone);
	1697	+ users.setEnable(1);
	1698	+ // users.setZhiChenId(zhiCId);
	1699	+ users.setPwd(MD5Utils.md5("123456").toUpperCase());
	1700	+ //users.setRemarks(remarks);
	1701	+ // users.setKsId(ksId);
	1702	+ // users.setPublishId(user.getId());
	1703	+ // users.setPublishName(user.getName());
	1704	+ users.setYn(YnEnums.YES.getId());
	1705	+ users.setModified(new Date());
	1706	+ users.setCreated(new Date());
	1707	+ // users.setZhiChen(ZhiChenEnums.getById(zhiCId));
	1708	+ // user.setDefaultPage(defaultPage);
	1709	+ usersService.addUsers(users);
	1710	+ patient.setLastCheckEmployeeId(String.valueOf(users.getId()));
	1711	+ }
	1712	+ }
	1713	+
1619	1714	patient.setOperator(userId);
1620	1715	patient.setScreening(yunRequest.getScreening());//特殊产筛建档
1621	1716
...	...	@@ -2479,7 +2574,8 @@
2479	2574	patient.setCloseCaseReason(yunRequest.getCloseCaseReason());
2480	2575	patient.setCloseCaseCode(yunRequest.getCloseCaseCode());
2481	2576	patient.setBuildingManualCode(yunRequest.getBuildingManualCode());
2482		-
	2577	+ patient.setLastCheckEmployeeId(yunRequest.getLastCheckEmployeeId());
	2578	+ patient.setHighRiskFileCode(yunRequest.getHighRiskFileCode());
2483	2579	return patient;
2484	2580	}
2485	2581
...	...	@@ -2739,6 +2835,8 @@
2739	2835	result.setCloseCaseReason(p.getCloseCaseReason());
2740	2836	result.setCloseCaseCode(p.getCloseCaseCode());
2741	2837	result.setBuildingManualCode(p.getBuildingManualCode());
	2838	+ result.setHighRiskFileCode(p.getHighRiskFileCode());
	2839	+ result.setLastCheckEmployeeId(p.getLastCheckEmployeeId());
2742	2840	return result;
2743	2841	}
2744	2842

...	...	@@ -2611,6 +2611,7 @@
2611	2611	patientsQuery.setYn(YnEnums.YES.getId());
2612	2612	patientsQuery.setIsAutoFm(YnEnums.NO.getId());
2613	2613	patientsQuery.setType(3);
	2614	+ patientsQuery.setHighRiskFileCode(childbirthManagerRequest.getHighRiskFileCode());
2614	2615	// 构造医院id集合
2615	2616	List<String> hospitalList = new ArrayList<>();
2616	2617	if (StringUtils.isEmpty(childbirthManagerRequest.getIsArea())) {

...	...	@@ -267,6 +267,7 @@
267	267	patientsQuery.setNormal(riskPatientsQueryRequest.getNormal());
268	268	patientsQuery.setLiveType(riskPatientsQueryRequest.getLiveType());
269	269	patientsQuery.setFirstCheckId(riskPatientsQueryRequest.getFirstCheckId());
	270	+ patientsQuery.setHighRiskFileCode(riskPatientsQueryRequest.getHighRiskFileCode());
270	271	//乡镇卫生院查询条件
271	272	if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getTownOrgId())) {
272	273	patientsQuery.setTownOrgId(riskPatientsQueryRequest.getTownOrgId());
...	...	@@ -3225,7 +3226,7 @@
3225	3226	//分娩状态
3226	3227	patientsQuery.setDueStatus(null==patientManagerRequest.getDueStatus() ? null : patientManagerRequest.getDueStatus());
3227	3228	patientsQuery.setType(patientManagerRequest.getType());
3228		- System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
	3229	+ patientsQuery.setHighRiskFileCode(patientManagerRequest.getHighRiskFileCode());
3229	3230	List <Patients> patientsList = patientsService.queryPatient(patientsQuery);
3230	3231	List <PatientManagerQueryModel> patientManagerQueryModelList = new ArrayList <>();
3231	3232	if (CollectionUtils.isNotEmpty(patientsList)) {

1	1	package com.lyms.platform.operate.web.facade;
2	2
3	3	import com.lyms.platform.beans.MsgRequest;
4		-import com.lyms.platform.biz.service.BabyService;
5		-import com.lyms.platform.biz.service.BasicConfigService;
6		-import com.lyms.platform.biz.service.CommonService;
7		-import com.lyms.platform.biz.service.PatientsService;
	4	+import com.lyms.platform.biz.service.*;
8	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
9	6	import com.lyms.platform.common.enums.*;
10	7	import com.lyms.platform.common.result.BaseListResponse;
11	8	import com.lyms.platform.common.result.BaseObjectResponse;
12	9	import com.lyms.platform.common.result.BaseResponse;
13		-import com.lyms.platform.common.utils.DateUtil;
14		-import com.lyms.platform.common.utils.StringUtils;
15		-import com.lyms.platform.common.utils.SystemConfig;
	10	+import com.lyms.platform.common.utils.*;
16	11	import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
17	12	import com.lyms.platform.operate.web.request.BasePageQueryRequest;
18		-import com.lyms.platform.operate.web.result.BasicConfigResult;
19		-import com.lyms.platform.operate.web.result.PatientSerResult;
	13	+import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest;
	14	+import com.lyms.platform.operate.web.request.JdStatisticsQueryRequest;
	15	+import com.lyms.platform.operate.web.result.*;
	16	+import com.lyms.platform.operate.web.utils.CommonsHelper;
	17	+import com.lyms.platform.permission.dao.master.CouponMapper;
20	18	import com.lyms.platform.permission.model.*;
21	19	import com.lyms.platform.permission.service.*;
22	20	import com.lyms.platform.pojo.*;
...	...	@@ -134,7 +132,7 @@
134	132	}
135	133
136	134
137		- public BaseResponse matDeliverServiceInit(Integer id){
	135	+ public BaseResponse matDeliverServiceInit(Integer id) {
138	136	//根据用户id获取医院ID
139	137	String hospitalId = autoMatchFacade.getHospitalId(id);
140	138	Map map = new HashMap();
...	...	@@ -329,7 +327,7 @@
329	327	List<Map<String, Object>> mapList = patientServiceService.selectServiceByHospital(hospitalId);
330	328	if (CollectionUtils.isNotEmpty(mapList)) {
331	329	logger.info("patientServiceSync mapList is not null");
332		- final Integer[] serTypes = {1,3, 4, 6};
	330	+ final Integer[] serTypes = {1, 3, 4, 6};
333	331	PatientServiceQuery patientQuery = new PatientServiceQuery();
334	332	patientQuery.setHospitalId(hospitalId);
335	333	patientQuery.setSerTypes(serTypes);
...	...	@@ -351,7 +349,7 @@
351	349	ids.addAll(set);
352	350	patientsQuery.setIdns(ids);
353	351	}
354		- final List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
	352	+ final List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
355	353	if (CollectionUtils.isNotEmpty(patientsList)) {
356	354	logger.info("patientServiceSync patientsList is not null");
357	355	for (int i = 0, j = mapList.size(); i < j; i++) {
...	...	@@ -411,7 +409,7 @@
411	409	patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
412	410	bookbuildingFacade.updatePatientSerById(parentId, patient);
413	411
414		- }else if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == serType) {
	412	+ } else if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == serType) {
415	413	PatientServiceQuery query = new PatientServiceQuery();
416	414	query.setParentid(parentId);
417	415	query.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId());
...	...	@@ -459,7 +457,7 @@
459	457
460	458
461	459	PatientService pser = new PatientService();
462		- if (StringUtils.isNotEmpty(ps.getCreateUser())){
	460	+ if (StringUtils.isNotEmpty(ps.getCreateUser())) {
463	461	pser.setCreateUser(ps.getCreateUser());
464	462	}
465	463
466	464
...	...	@@ -495,9 +493,9 @@
495	493	pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId());
496	494	//服务类型
497	495	pser.setSerType(Integer.parseInt(serInfo.get("serType")));
498		- if("2100002419".equals(hospitalId)){
	496	+ if ("2100002419".equals(hospitalId)) {
499	497	pser.setSerDoct(userId.toString());
500		- }else{
	498	+ } else {
501	499	if (serInfo.containsKey("serDoct")) {
502	500	pser.setSerDoct(serInfo.get("serDoct"));
503	501	}
...	...	@@ -513,7 +511,7 @@
513	511	//服务开通操作时间
514	512	pser.setUpdateDate(new Date());
515	513	//服务开通操作人
516		- if (userId!=null){
	514	+ if (userId != null) {
517	515	pser.setUpdateUser(String.valueOf(userId));
518	516	}
519	517
...	...	@@ -558,7 +556,7 @@
558	556	babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest);
559	557	}
560	558	}
561		- } else if (ps.getPerType() != null && ps.getPerType() == 1){//孕妇建档服务数据处理
	559	+ } else if (ps.getPerType() != null && ps.getPerType() == 1) {//孕妇建档服务数据处理
562	560	if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == Integer.parseInt(serInfo.get("serType"))) {//孕期精准指导同步到建档
563	561	System.out.println("333333333333333333333");
564	562	Patients patient = new Patients();
...	...	@@ -566,7 +564,7 @@
566	564	patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
567	565	bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient);
568	566
569		- sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",ServiceObjEnums.YUNOBJ.getId(),1);
	567	+ sendServiceMsg(patients, SmsServiceEnums.FWKT.getId(), "您好，请点击此处查看开通服务内容详情。", "大同市第一人民医院", ServiceObjEnums.YUNOBJ.getId(), 1);
570	568
571	569	} else if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) {
572	570	System.out.println("555555555555555555555555");
573	571
...	...	@@ -582,14 +580,14 @@
582	580	bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient);
583	581	}
584	582	}
585		- }else {//产妇建档服务数据处理
	583	+ } else {//产妇建档服务数据处理
586	584	if (PatientSerEnums.SerTypeEnums.chkf.getId() == Integer.parseInt(serInfo.get("serType"))) {//产后康复同步到建档
587	585	System.out.println("66666666666666666");
588	586	Patients patient = new Patients();
589	587	patient.setServiceType(ServiceTypeEnums.ADD_MAT_DELIVER_SERVICE.getId());
590	588	patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
591	589	bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient);
592		- sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",ServiceObjEnums.CHANOBJ.getId(),1);
	590	+ sendServiceMsg(patients, SmsServiceEnums.FWKT.getId(), "您好，请点击此处查看开通服务内容详情。", "大同市第一人民医院", ServiceObjEnums.CHANOBJ.getId(), 1);
593	591
594	592	}
595	593	}
...	...	@@ -602,8 +600,9 @@
602	600	baseResponse.setErrormsg("成功");
603	601	return baseResponse;
604	602	}
605		- //大同医院服务推送\短信
606		- public void sendServiceMsg(Patients patient, Integer subTypeId, String first, String keyWord1,Integer objType,Integer type){
	603	+
	604	+ //大同医院服务推送\短信
	605	+ public void sendServiceMsg(Patients patient, Integer subTypeId, String first, String keyWord1, Integer objType, Integer type) {
607	606	System.out.println("333333333333333333333");
608	607	if ("2100002419".equals(patient.getHospitalId())) {
609	608	try {
...	...	@@ -632,7 +631,7 @@
632	631	mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
633	632	mr.setWxTempId(WxTempleteIdEnums.YUX_XUE_KE_CHEN_FB.getId());
634	633	messages.add(mr);
635		- if (type!=null){
	634	+ if (type != null) {
636	635	String title = "服务提醒短信";
637	636	String messageContent = "【大同市第一人民医院】" + "欢迎加入我院健康咨询服务：请微信-添加朋友-公众号-搜索“美生孕育”关注；点击开通成功提醒，手机号获取验证码成功登录宝贝孕程小程序。请确保登录成功并持续关注“美生孕育”公众号，正常接收产检提醒，享受个性化指导文章推送、孕期随访及营养指导等服务。";
638	637	MsgRequest request = new MsgRequest();
...	...	@@ -656,7 +655,7 @@
656	655	request.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
657	656	request.setFirst(messageContent);
658	657	request.setKeyword1(title);
659		- request.setKeyword2(DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(),0)));
	658	+ request.setKeyword2(DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(), 0)));
660	659	messages.add(request);
661	660	}
662	661
...	...	@@ -808,7 +807,7 @@
808	807
809	808	PatientService before = patientServiceService.getPatientService(ps.getId());
810	809	//开通人为上一次的数据，因为系统端不能修改，但是小程序可以修改
811		- if (StringUtils.isNotEmpty(before.getCreateUser())){
	810	+ if (StringUtils.isNotEmpty(before.getCreateUser())) {
812	811	ps.setCreateUser(before.getCreateUser());
813	812	}
814	813
...	...	@@ -826,7 +825,7 @@
826	825	ps.setDoctorWeek(ps.getDoctorWeek() + (before.getDoctorWeek() != null ? before.getDoctorWeek() : 0));
827	826	}
828	827	}
829		- if (before.getPerType()!=2){
	828	+ if (before.getPerType() != 2) {
830	829	//修改服务时增加孕周内容 cfl 20231019
831	830	Patients patients = patientsService.findOnePatientById(ps.getParentid());
832	831	setServiceRecordUpdate(ps, patients);
...	...	@@ -904,7 +903,7 @@
904	903	patient.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId());
905	904	}
906	905	}
907		- }else {
	906	+ } else {
908	907	if (PatientSerEnums.SerTypeEnums.chkf.getId() == ps.getSerType().intValue()) {//产后康复同步到建档
909	908
910	909	patient.setServiceType(ServiceTypeEnums.ADD_MAT_DELIVER_SERVICE.getId());
...	...	@@ -917,7 +916,7 @@
917	916	} else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.zt.getId().intValue()) {
918	917	patient.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId());
919	918	}
920		- // bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient);
	919	+ // bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient);
921	920
922	921
923	922	}
924	923
...	...	@@ -1533,6 +1532,244 @@
1533	1532	// }
1534	1533	// }
1535	1534	}
	1535	+ @Autowired
	1536	+ private CommunityConfigService communityConfigService;
	1537	+ @Autowired
	1538	+ private CouponMapper couponMapper;
1536	1539
	1540	+ public BaseResponse queryStatistics(Integer userId, JdStatisticsQueryRequest statisticsQueryRequest) {
	1541	+ BaseListResponse baseResponse = new BaseListResponse();
	1542	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	1543	+ if (StringUtils.isEmpty(hospitalId)) {
	1544	+ baseResponse.setErrormsg("获取医院id为空").setErrorcode(ErrorCodeConstants.SUCCESS);
	1545	+ return baseResponse;
	1546	+ }
	1547	+
	1548	+ PatientsQuery patientsQuery=new PatientsQuery();
	1549	+ patientsQuery.setYn(1);
	1550	+ patientsQuery.setHospitalId(hospitalId);
	1551	+ patientsQuery.setNeed("1");
	1552	+ patientsQuery.setPage(statisticsQueryRequest.getPage());
	1553	+ patientsQuery.setLimit(statisticsQueryRequest.getLimit());
	1554	+ if (StringUtils.isNotEmpty(statisticsQueryRequest.getDueDate())){
	1555	+ String time=statisticsQueryRequest.getDueDate();
	1556	+ patientsQuery.setDueDateStart(DateUtil.parseYMDHMS(time+" 00:00:00"));
	1557	+ patientsQuery.setDueDateEnd(DateUtil.parseYMDHMS(time+" 23:59:59"));
	1558	+ }
	1559	+ if (StringUtils.isNotEmpty(statisticsQueryRequest.getBookbuildingDoctor())){
	1560	+ patientsQuery.setBookbuildingDoctor(statisticsQueryRequest.getBookbuildingDoctor());
	1561	+ }
	1562	+ if (StringUtils.isNotEmpty(statisticsQueryRequest.getBookbuildingDate())){
	1563	+ String time=statisticsQueryRequest.getDueDate();
	1564	+ patientsQuery.setBookbuildingDateStart(DateUtil.parseYMDHMS(time+" 00:00:00"));
	1565	+ patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMDHMS(time+" 23:59:59"));
	1566	+ }
	1567	+ List data = new ArrayList<>();
	1568	+ if (statisticsQueryRequest.getType()==0){
	1569	+ if (StringUtils.isEmpty(statisticsQueryRequest.getBookbuildingDoctor())){
	1570	+ patientsQuery.setNebookbuildingDoctor("1");
	1571	+ }
	1572	+ List<HashMap> list = patientsService.aggregatbookbuildingDoctore(patientsQuery);
	1573	+ for (HashMap map : list) {
	1574	+ CjStatisticsResult cjStatisticsResult = new CjStatisticsResult();
	1575	+ String dId = null;
	1576	+ Object id = map.get("_id");
	1577	+ if (null != id) {
	1578	+ dId = id.toString();
	1579	+ } else {
	1580	+ continue;
	1581	+ }
	1582	+
	1583	+ cjStatisticsResult.setdId(dId);
	1584	+ cjStatisticsResult.setCount(map.get("count").toString());
	1585	+ try {
	1586	+ if (null == dId) {
	1587	+ cjStatisticsResult.setdName("未知");
	1588	+ } else {
	1589	+ Users users = usersService.getUsers(Integer.valueOf(dId));
	1590	+ if (null != users) {
	1591	+ cjStatisticsResult.setdName(users.getName());
	1592	+ }else {
	1593	+ continue;
	1594	+ }
	1595	+ }
	1596	+ } catch (Exception e) {
	1597	+ }
	1598	+ data.add(cjStatisticsResult);
	1599	+ }
	1600	+ Collections.sort(data, new CjStatisticsResult());
	1601	+ baseResponse.setObject(data);
	1602	+ }else {
	1603	+ List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
	1604	+ List <PatientManagerQueryModel> patientManagerQueryModelList = new ArrayList <>();
	1605	+ if (CollectionUtils.isNotEmpty(patientsList)){
	1606	+ if (CollectionUtils.isNotEmpty(patientsList)) {
	1607	+ for (Patients patients : patientsList) {
	1608	+ PatientManagerQueryModel patientManagerQueryModel = new PatientManagerQueryModel();
	1609	+ BeanUtils.copy(patients, patientManagerQueryModel);
	1610	+
	1611	+// patientManagerQueryModel.setLevel(patients.getRiskLevelId());
	1612	+// String join = org.apache.commons.lang.StringUtils.join( patients.getRiskFactorId(), ",");
	1613	+// patientManagerQueryModel.setRiskFactorId(join);
	1614	+ //高危因素
	1615	+ List<String> factor = patients.getRiskFactorId();
	1616	+
	1617	+ if (CollectionUtils.isNotEmpty(factor)) {
	1618	+ StringBuilder sb = new StringBuilder(56);
	1619	+ for (String srt : factor) {
	1620	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(srt)) {
	1621	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt);
	1622	+ if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) {
	1623	+ sb.append(basicConfig.getName()).append(',');
	1624	+ }
	1625	+ }
	1626	+ }
	1627	+ if (sb.toString().endsWith(",")) {
	1628	+ patientManagerQueryModel.setRiskFactorId(sb.substring(0, sb.length() - 1));
	1629	+ } else {
	1630	+ patientManagerQueryModel.setRiskFactorId(sb.toString());
	1631	+ }
	1632	+
	1633	+ if (!"-".equals(patientManagerQueryModel.getRiskFactorId()) && org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) {
	1634	+ patientManagerQueryModel.setRiskFactorId(patientManagerQueryModel.getRiskFactorId()+","+patients.getoRiskFactor());
	1635	+ }else if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor()))
	1636	+ {
	1637	+ patientManagerQueryModel.setRiskFactorId(patients.getoRiskFactor());
	1638	+ }
	1639	+ }
	1640	+ else if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor()))
	1641	+ {
	1642	+ patientManagerQueryModel.setRiskFactorId(patients.getoRiskFactor());
	1643	+ }
	1644	+
	1645	+
	1646	+ List level = new ArrayList();
	1647	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getRiskLevelId())) {
	1648	+ try {
	1649	+ List<String> list = JsonUtil.patientRiskLevelIdToList(patients.getRiskLevelId());
	1650	+ for (String str : list) {
	1651	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str);
	1652	+ if (null != basicConfig) {
	1653	+ Map map = new HashMap();
	1654	+ basicConfig.replenRisk(map);
	1655	+ level.add(map);
	1656	+ }
	1657	+ }
	1658	+ } catch (Exception e) {
	1659	+ ExceptionUtils.catchException(e, "patients.getRiskLevelId error.");
	1660	+ }
	1661	+ patientManagerQueryModel.setLevel(HighScoreResult.filter(level));
	1662	+ }
	1663	+
	1664	+ Organization org = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId()));
	1665	+ if(null != org){
	1666	+ patientManagerQueryModel.setOrgType(org.getType());
	1667	+ }
	1668	+
	1669	+ String comm = "未分配";
	1670	+ if(StringUtils.isNotEmpty(patients.getCommunityId())){
	1671	+ CommunityConfig communityConfig = communityConfigService.getCommunityById(patients.getCommunityId());
	1672	+ if(null != communityConfig){
	1673	+ comm = communityConfig.getName();
	1674	+ }
	1675	+ }
	1676	+ patientManagerQueryModel.setCouponCommunity(comm);
	1677	+ patientManagerQueryModel.setTypeStr(patients.getType() == 1 ? "未分娩" : "已分娩");
	1678	+ patientManagerQueryModel.setYyzyfmHospitalName(
	1679	+ (patients.getYyzyfmHospitalId() != null && "-1".equals(patients.getYyzyfmHospitalId())) ? "其他" : couponMapper.getHospitalName(patients.getYyzyfmHospitalId()));
	1680	+ patientManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth()));
	1681	+ patientManagerQueryModel.setpId(patients.getPid());
	1682	+ String dueWeek = "";
	1683	+ try {
	1684	+ if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) {
	1685	+// if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) {
	1686	+ dueWeek = "已分娩";
	1687	+ } else {
	1688	+ int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate());
	1689	+ if (days > 7 * 42 - 1) {
	1690	+ dueWeek = "已分娩";
	1691	+ } else {
	1692	+ String week = (days / 7) + "";
	1693	+ int day = (days % 7);
	1694	+ dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
	1695	+ }
	1696	+ }
	1697	+ } catch (Exception e) {
	1698	+ // 什么都不干
	1699	+ }
	1700	+ if ("1000000114".equals(patients.getHospitalId())) {
	1701	+ patientManagerQueryModel.setPhone(patients.getPhone());
	1702	+ patientManagerQueryModel.setCardNo(patients.getCardNo());
	1703	+ } else {
	1704	+ patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone()));
	1705	+ patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo()));
	1706	+ }
	1707	+ patientManagerQueryModel.setBuildWeek(dueWeek);
	1708	+
	1709	+ String bookbuildingDoctor = "";
	1710	+ if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) {
	1711	+ Users user = usersService.getUsers(Integer.valueOf(patients.getBookbuildingDoctor()));
	1712	+ if (user != null) {
	1713	+ bookbuildingDoctor = user.getName();
	1714	+ } else {
	1715	+ System.out.println(patients.getId() + ";no user bookbuildingDoctor" + patients.getBookbuildingDoctor());
	1716	+ }
	1717	+ }
	1718	+ //初诊时间和初诊医生字段展示,作为模块化
	1719	+ if (StringUtils.isNotEmpty(patients.getFirstCheckId())) {
	1720	+ Users users = usersService.getUsers(Integer.parseInt(patients.getFirstCheckId()));
	1721	+ if (users != null) {
	1722	+ patientManagerQueryModel.setProdDoctor(users.getName());
	1723	+ }
	1724	+ patientManagerQueryModel.setCheckTime(DateUtil.getyyyy_MM_dd(patients.getFirstCheckTime()));
	1725	+ }
	1726	+ //滦平,围场,需求。初诊时间和初诊医生字段展示。
	1727	+// if ("2100001377".equals(hospitalId)\|\|"2100001452".equals(hospitalId)) {
	1728	+// //初诊
	1729	+// AntExChuQuery antExChuQuery = new AntExChuQuery();
	1730	+// antExChuQuery.setYn(YnEnums.YES.getId());
	1731	+// antExChuQuery.setHospitalId(hospitalId);
	1732	+// antExChuQuery.setParentId(patients.getId());
	1733	+// List <AntExChuModel> antExChuModelList = antExService.queryAntExChu(antExChuQuery.convertToQuery());
	1734	+// if (CollectionUtils.isNotEmpty(antExChuModelList)) {
	1735	+// AntExChuModel antExChuModel = antExChuModelList.get(0);
	1736	+// if (StringUtils.isNotEmpty(antExChuModel.getProdDoctor())) {
	1737	+// Users users = usersService.getUsers(Integer.parseInt(antExChuModel.getProdDoctor()));
	1738	+// if (users != null) {
	1739	+// patientManagerQueryModel.setProdDoctor(users.getName());
	1740	+// }
	1741	+// }
	1742	+// patientManagerQueryModel.setCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime()));
	1743	+// }
	1744	+// }
	1745	+ patientManagerQueryModel.setBooksuifangDoctor(patients.getBooksuifangDoctor());
	1746	+ patientManagerQueryModel.setBookbuildingDoctor(bookbuildingDoctor);
	1747	+ patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
	1748	+ patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
	1749	+ patientManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
	1750	+ patientManagerQueryModel.setId(patients.getId());
	1751	+ patientManagerQueryModel.setLowerHairOgrId(StringUtils.isNotEmpty(patients.getLowerHairOgrId()) ? organizationService.getOrganizationName(patients.getLowerHairOgrId()) : "");
	1752	+ if (patients.getSendCareMan() != null) {
	1753	+ if ("0".equals(patients.getSendCareMan())) {
	1754	+ patientManagerQueryModel.setSendCareMan("未发放");
	1755	+ } else if ("1".equals(patients.getSendCareMan())) {
	1756	+ patientManagerQueryModel.setSendCareMan("首发");
	1757	+ } else if ("2".equals(patients.getSendCareMan())) {
	1758	+ patientManagerQueryModel.setSendCareMan("补发");
	1759	+ }
	1760	+ }
	1761	+
	1762	+ //滦平20211227
	1763	+ patientManagerQueryModel.setNextCheckTime(DateUtil.getyyyy_MM_dd(patients.getNextCheckTime()));
	1764	+ patientManagerQueryModelList.add(patientManagerQueryModel);
	1765	+
	1766	+ }
	1767	+ }
	1768	+ }
	1769	+ baseResponse.setData(patientManagerQueryModelList).setPageInfo(patientsQuery.getPageInfo());
	1770	+ }
	1771	+
	1772	+ return baseResponse;
	1773	+ }
1537	1774	}

...	...	@@ -136,6 +136,8 @@
136	136	private String sieveType;
137	137
138	138	private String teamId;
	139	+ // 大同高危专号查询
	140	+ private String highRiskFileCode;
139	141
140	142	public String getVillageRegisterId() {
141	143	return villageRegisterId;
...	...	@@ -555,6 +557,14 @@
555	557
556	558	public void setCzhospitalId(String czhospitalId) {
557	559	this.czhospitalId = czhospitalId;
	560	+ }
	561	+
	562	+ public String getHighRiskFileCode() {
	563	+ return highRiskFileCode;
	564	+ }
	565	+
	566	+ public void setHighRiskFileCode(String highRiskFileCode) {
	567	+ this.highRiskFileCode = highRiskFileCode;
558	568	}
559	569	}

...	...	@@ -154,6 +154,17 @@
154	154	//胎次
155	155	private Integer dueCount;
156	156
	157	+ //大同高危专号
	158	+ private String highRiskFileCode;
	159	+
	160	+ public String getHighRiskFileCode() {
	161	+ return highRiskFileCode;
	162	+ }
	163	+
	164	+ public void setHighRiskFileCode(String highRiskFileCode) {
	165	+ this.highRiskFileCode = highRiskFileCode;
	166	+ }
	167	+
157	168	public Integer getDueCount() {
158	169	return dueCount;
159	170	}

	1	+package com.lyms.platform.operate.web.request;
	2	+
	3	+import java.util.Date;
	4	+
	5	+/**
	6	+ * 建档统计管理
	7	+ */
	8	+public class JdStatisticsQueryRequest extends BasePageQueryRequest {
	9	+ //0 统计 1 类别
	10	+ private int type=0;
	11	+ //建档医生
	12	+ private String bookbuildingDoctor;
	13	+ //建档日期
	14	+ private String bookbuildingDate;
	15	+ //预产期
	16	+ private String dueDate;
	17	+
	18	+ public String getBookbuildingDoctor() {
	19	+ return bookbuildingDoctor;
	20	+ }
	21	+
	22	+ public void setBookbuildingDoctor(String bookbuildingDoctor) {
	23	+ this.bookbuildingDoctor = bookbuildingDoctor;
	24	+ }
	25	+
	26	+ public String getBookbuildingDate() {
	27	+ return bookbuildingDate;
	28	+ }
	29	+
	30	+ public void setBookbuildingDate(String bookbuildingDate) {
	31	+ this.bookbuildingDate = bookbuildingDate;
	32	+ }
	33	+
	34	+ public String getDueDate() {
	35	+ return dueDate;
	36	+ }
	37	+
	38	+ public void setDueDate(String dueDate) {
	39	+ this.dueDate = dueDate;
	40	+ }
	41	+
	42	+ public int getType() {
	43	+ return type;
	44	+ }
	45	+
	46	+ public void setType(int type) {
	47	+ this.type = type;
	48	+ }
	49	+}

...	...	@@ -54,6 +54,8 @@
54	54
55	55	//乐陵是妇幼母子保健手册下发机构
56	56	private String lowerHairOgrId;
	57	+ // 大同高危专号查询
	58	+ private String highRiskFileCode;
57	59
58	60
59	61	public Integer getType() {
...	...	@@ -356,5 +358,12 @@
356	358	this.operatorId = operatorId;
357	359	}
358	360
	361	+ public String getHighRiskFileCode() {
	362	+ return highRiskFileCode;
	363	+ }
	364	+
	365	+ public void setHighRiskFileCode(String highRiskFileCode) {
	366	+ this.highRiskFileCode = highRiskFileCode;
	367	+ }
359	368	}

...	...	@@ -193,8 +193,17 @@
193	193
194	194	//体重异常管理-接收建档时间筛选用
195	195	private String buildDate;
	196	+ //大同高危专号
	197	+ private String highRiskFileCode;
196	198
197	199
	200	+ public String getHighRiskFileCode() {
	201	+ return highRiskFileCode;
	202	+ }
	203	+
	204	+ public void setHighRiskFileCode(String highRiskFileCode) {
	205	+ this.highRiskFileCode = highRiskFileCode;
	206	+ }
198	207
199	208	public String getVillageRegisterId() {
200	209	return villageRegisterId;

...	...	@@ -477,8 +477,12 @@
477	477	//备注
478	478	private String mremark;
479	479
480		- //高危专案档案号
	480	+ //高危专案档案号大同
481	481	private String highRiskFileCode;
	482	+ //产检医生大同
	483	+ private String lastCheckEmployeeId;
	484	+ //产检医生
	485	+ private String lastCheckEmployeeName;
482	486
483	487	//就诊卡号
484	488	@FormParam
...	...	@@ -622,6 +626,14 @@
622	626	//是否建册
623	627	private String buildingManualCode;
624	628
	629	+ public String getLastCheckEmployeeName() {
	630	+ return lastCheckEmployeeName;
	631	+ }
	632	+
	633	+ public void setLastCheckEmployeeName(String lastCheckEmployeeName) {
	634	+ this.lastCheckEmployeeName = lastCheckEmployeeName;
	635	+ }
	636	+
625	637	public Integer getIsAppCreate() {
626	638	return isAppCreate;
627	639	}
...	...	@@ -1495,6 +1507,14 @@
1495	1507
1496	1508	public void setHighRiskFileCode(String highRiskFileCode) {
1497	1509	this.highRiskFileCode = highRiskFileCode;
	1510	+ }
	1511	+
	1512	+ public String getLastCheckEmployeeId() {
	1513	+ return lastCheckEmployeeId;
	1514	+ }
	1515	+
	1516	+ public void setLastCheckEmployeeId(String lastCheckEmployeeId) {
	1517	+ this.lastCheckEmployeeId = lastCheckEmployeeId;
1498	1518	}
1499	1519
1500	1520	@Override

...	...	@@ -51,7 +51,26 @@
51	51	*/
52	52	//空或者1为正常 2为补录
53	53	private String normal;
	54	+ //高危专案档案号大同
	55	+ private String highRiskFileCode;
	56	+ //最后一次产检医生职工ID
	57	+ private String lastCheckEmployeeId;
54	58
	59	+ public String getLastCheckEmployeeId() {
	60	+ return lastCheckEmployeeId;
	61	+ }
	62	+
	63	+ public void setLastCheckEmployeeId(String lastCheckEmployeeId) {
	64	+ this.lastCheckEmployeeId = lastCheckEmployeeId;
	65	+ }
	66	+
	67	+ public String getHighRiskFileCode() {
	68	+ return highRiskFileCode;
	69	+ }
	70	+
	71	+ public void setHighRiskFileCode(String highRiskFileCode) {
	72	+ this.highRiskFileCode = highRiskFileCode;
	73	+ }
55	74
56	75	public String getIsYyzyfmHospital() {
57	76	return isYyzyfmHospital;