jiangjiazhi / regional-platform

Commit cbfde61ef95089c3691546d4dcd3c75a0f557317

Authored by zhangchao 12 months ago

1 parent 2038d04c51

Exists in dev

#fix:大同新增本院专属管理模块

Showing 17 changed files with 114 additions and 13 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/ArchiveData.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/PostReviewController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.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/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/PatientManagerRequest.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/PatientManagerQueryModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java

...	...	@@ -22,9 +22,20 @@
22	22	private String jsonData;
23	23	private Date created;
24	24	private String assistUserId;
	25	+ //大同本院职工 0为否 1为是
	26	+ private Integer userType;
25	27
26	28	//建档成功时间
27	29	private Date buildDate;
	30	+
	31	+
	32	+ public Integer getUserType() {
	33	+ return userType;
	34	+ }
	35	+
	36	+ public void setUserType(Integer userType) {
	37	+ this.userType = userType;
	38	+ }
28	39
29	40	public Date getBuildDate() {
30	41	return buildDate;

...	...	@@ -514,6 +514,17 @@
514	514	private String HIVJ;//人类免疫缺陷病毒抗体
515	515	private String tp;//梅毒螺旋体抗体
516	516
	517	+ //大同职工 1为是 0为否
	518	+ private Integer userType;
	519	+
	520	+ public Integer getUserType() {
	521	+ return userType;
	522	+ }
	523	+
	524	+ public void setUserType(Integer userType) {
	525	+ this.userType = userType;
	526	+ }
	527	+
517	528	public String getHBcAbJ() {
518	529	return HBcAbJ;
519	530	}

...	...	@@ -439,7 +439,18 @@
439	439	private String nebookbuildingDoctor;
440	440
441	441	private Map<String,Date> mapTime;
	442	+ //大同院内职工 1为是 0为否
	443	+ private Integer userType;
442	444
	445	+
	446	+ public Integer getUserType() {
	447	+ return userType;
	448	+ }
	449	+
	450	+ public void setUserType(Integer userType) {
	451	+ this.userType = userType;
	452	+ }
	453	+
443	454	public String getNebookbuildingDoctor() {
444	455	return nebookbuildingDoctor;
445	456	}
...	...	@@ -1252,6 +1263,10 @@
1252	1263
1253	1264	if (null != notEnable) {
1254	1265	condition = condition.and("enable", notEnable, MongoOper.NE);
	1266	+ }
	1267	+
	1268	+ if (userType!=null){
	1269	+ condition = condition.and("userType", userType, MongoOper.IS);
1255	1270	}
1256	1271
1257	1272	if (null != orServiceStatus && orServiceStatus.length > 1) {

...	...	@@ -165,7 +165,8 @@
165	165	String provinceId,
166	166	String cityId,
167	167	String areaId,
168		- String streetId
	168	+ String streetId,
	169	+ Integer userType
169	170	) {
170	171	return postReviewService.postpartumReview(getUserId(request), startDate, endDate, doctorId, key, page, limit, startDay,
171	172	endDay, zyList, jcxList,gcDoctorId,
...	...	@@ -182,7 +183,8 @@
182	183	provinceId,
183	184	cityId,
184	185	areaId,
185		- streetId
	186	+ streetId,
	187	+ userType
186	188	);
187	189	}
188	190
189	191
...	...	@@ -197,10 +199,10 @@
197	199	@RequestMapping(method = RequestMethod.GET, value = "/postpartum/review/export")
198	200	@TokenRequired
199	201	public void postpartumReviewExport(Date startDate, Date endDate, String doctorId,
200		- Integer startDay, Integer endDay,
	202	+ Integer startDay, Integer endDay,Integer userType,
201	203	String key, HttpServletRequest request, HttpServletResponse response) {
202	204	postReviewService.postpartumReviewExport(getUserId(request), startDate, endDate, doctorId, key,
203		- response,startDay, endDay);
	205	+ response,startDay, endDay,userType);
204	206	}
205	207
206	208

...	...	@@ -67,5 +67,13 @@
67	67	questionnaireFacade.update(questionnaireEntity);
68	68	ResultUtils.buildSuccessResultAndWrite(response);
69	69	}
	70	+
	71	+ @RequestMapping(method = RequestMethod.GET, value = "/questionnaire")
	72	+ public void getListPc(HttpServletResponse response){
	73	+ QuestionnaireQuery questionnaireQuery=new QuestionnaireQuery();
	74	+ questionnaireQuery.setStatus(1);
	75	+ List<QuestionnaireEntity> list= questionnaireFacade.getList(questionnaireQuery);
	76	+ ResultUtils.buildSuccessResultAndWrite(response,list);
	77	+ }
70	78	}

...	...	@@ -282,6 +282,7 @@
282	282	String name,
283	283	String cardNum,
284	284	String phone,
	285	+ @RequestParam(required = false)String userType,
285	286	@RequestParam(required = false)String assistUserId) {
286	287	try {
287	288	ArchiveData data = new ArchiveData();
...	...	@@ -291,6 +292,9 @@
291	292	data.setName(name);
292	293	data.setCardNum(cardNum);
293	294	data.setPhone(phone);
	295	+ if (StringUtils.isNotEmpty(userType)){
	296	+ data.setUserType(Integer.valueOf(userType));
	297	+ }
294	298	data.setJsonData(jsonData);
295	299	data.setCreated(new Date());
296	300	data.setAssistUserId(assistUserId);

...	...	@@ -410,11 +410,12 @@
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()) \|\| StringUtils.isNotEmpty(antExManagerQueryRequest.getHighRiskFileCode())) {
	413	+ if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo()) \|\| StringUtils.isNotEmpty(antExManagerQueryRequest.getHighRiskFileCode()) \|\| (antExManagerQueryRequest.getUserType()!=null&&antExManagerQueryRequest.getUserType()==1)) {
414	414
415	415	patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo());
416	416	patientsQuery.setHighRiskFileCode(antExManagerQueryRequest.getHighRiskFileCode());
417		- System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
	417	+ patientsQuery.setUserType(antExManagerQueryRequest.getUserType());
	418	+ // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
418	419	patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified");
419	420
420	421	if (CollectionUtils.isEmpty(patientses)) {
...	...	@@ -444,7 +445,7 @@
444	445	parentIds.add(pa.getId());
445	446	}
446	447	antExRecordQuery.setParentIds(parentIds);
447		- } else if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo()) \|\| StringUtils.isNotEmpty(antExManagerQueryRequest.getHighRiskFileCode())) {
	448	+ } else if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo()) \|\| StringUtils.isNotEmpty(antExManagerQueryRequest.getHighRiskFileCode()) \|\| (antExManagerQueryRequest.getUserType()!=null&&antExManagerQueryRequest.getUserType()==1)) {
448	449	return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(antExRecordQuery.getPageInfo());
449	450	}
450	451	String hospital = autoMatchFacade.getHospitalId(userId);

...	...	@@ -2584,6 +2584,7 @@
2584	2584	patient.setBuildingManualCode(yunRequest.getBuildingManualCode());
2585	2585	patient.setLastCheckEmployeeId(yunRequest.getLastCheckEmployeeId());
2586	2586	patient.setHighRiskFileCode(yunRequest.getHighRiskFileCode());
	2587	+ patient.setUserType(yunRequest.getUserType());
2587	2588	return patient;
2588	2589	}
2589	2590

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

...	...	@@ -3208,6 +3208,7 @@
3208	3208	}*/
3209	3209
3210	3210	patientsQuery.setYn(YnEnums.YES.getId());
	3211	+ patientsQuery.setUserType(patientManagerRequest.getUserType());
3211	3212	if (!patientManagerRequest.isExcel()) {
3212	3213	patientsQuery.setNeed("need");
3213	3214	patientsQuery.setLimit(patientManagerRequest.getLimit());

...	...	@@ -139,6 +139,16 @@
139	139	// 大同高危专号查询
140	140	private String highRiskFileCode;
141	141
	142	+ private Integer userType;
	143	+
	144	+ public Integer getUserType() {
	145	+ return userType;
	146	+ }
	147	+
	148	+ public void setUserType(Integer userType) {
	149	+ this.userType = userType;
	150	+ }
	151	+
142	152	public String getVillageRegisterId() {
143	153	return villageRegisterId;
144	154	}

...	...	@@ -156,6 +156,16 @@
156	156
157	157	//大同高危专号
158	158	private String highRiskFileCode;
	159	+ //大同职工 1为是 0为否
	160	+ private Integer userType;
	161	+
	162	+ public Integer getUserType() {
	163	+ return userType;
	164	+ }
	165	+
	166	+ public void setUserType(Integer userType) {
	167	+ this.userType = userType;
	168	+ }
159	169
160	170	public String getHighRiskFileCode() {
161	171	return highRiskFileCode;

...	...	@@ -155,8 +155,18 @@
155	155
156	156	//1 本县嫁外县 2 外县嫁本县
157	157	private Integer wqxType;
	158	+ //大同本院职工 1为是 0为否
	159	+ private Integer userType;
158	160
159	161	private String booksuifangDoctor;
	162	+
	163	+ public Integer getUserType() {
	164	+ return userType;
	165	+ }
	166	+
	167	+ public void setUserType(Integer userType) {
	168	+ this.userType = userType;
	169	+ }
160	170
161	171	public String getBooksuifangDoctor() {
162	172	return booksuifangDoctor;

...	...	@@ -90,6 +90,15 @@
90	90	private String riskFactorId;
91	91	private String level;
92	92
	93	+ private Integer userType;//大同本院职工 1为是 0为否
	94	+
	95	+ public Integer getUserType() {
	96	+ return userType;
	97	+ }
	98	+
	99	+ public void setUserType(Integer userType) {
	100	+ this.userType = userType;
	101	+ }
93	102
94	103	public String getRiskFactorId() {
95	104	return riskFactorId;

...	...	@@ -132,6 +132,8 @@
132	132	//预产期
133	133	private Date dueDate;
134	134
	135	+ private Integer userType;//大同职工 1为是 0为否
	136	+
135	137	public Integer getOrgType() {
136	138	return orgType;
137	139	}

...	...	@@ -29,8 +29,9 @@
29	29	String provinceId,
30	30	String cityId,
31	31	String areaId,
32		- String streetId);
	32	+ String streetId,
	33	+ Integer userType);
33	34
34		- void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay);
	35	+ void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay,Integer userType);
35	36	}

...	...	@@ -77,7 +77,8 @@
77	77	String provinceId,
78	78	String cityId,
79	79	String areaId,
80		- String streetId
	80	+ String streetId,
	81	+ Integer userType
81	82	) {
82	83
83	84
...	...	@@ -251,7 +252,7 @@
251	252	}
252	253
253	254
254		- if(StringUtils.isNotEmpty(key) \|\| StringUtils.isNotEmpty(gcDoctorId)) {
	255	+ if(StringUtils.isNotEmpty(key) \|\| StringUtils.isNotEmpty(gcDoctorId) \|\| userType!=null) {
255	256	Criteria criteria = new Criteria();
256	257	if (StringUtils.isNotEmpty(gcDoctorId))
257	258	{
...	...	@@ -261,6 +262,9 @@
261	262	{
262	263	criteria.orOperator(Criteria.where("username").regex(key), Criteria.where("cardNo").is(key), Criteria.where("phone").is(key).and("yn").ne(0));
263	264	}
	265	+ if (userType!=null){
	266	+ criteria.and("userType").is(userType);
	267	+ }
264	268	List<Patients> patients = mongoUtil.findField(Patients.class, criteria, "id");
265	269	if(CollectionUtils.isEmpty(patients)) {
266	270	return RespBuilder.buildSuccess(new PageResult(0, page, limit, null));
267	271
...	...	@@ -340,9 +344,9 @@
340	344	}
341	345
342	346	@Override
343		- public void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay) {
	347	+ public void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay,Integer userType) {
344	348	BaseObjectResponse rest = postpartumReview(userId, startDate, endDate, doctorId, key, 1, Integer.MAX_VALUE,startDay,endDay,null,null,null,null,null,null,null,null,null,null,null,null,
345		- null,null,null,null,null);
	349	+ null,null,null,null,null,userType);
346	350	PageResult pageResult = (PageResult) rest.getData();
347	351	List<Map<String, Object>> datas = (List<Map<String, Object>>) pageResult.getGrid();
348	352	Map<String, String> cnames = new LinkedHashMap<>();