jiangjiazhi / regional-platform

Commit f239d897feb5f8c18dd9dc6982c9915491098d71

Authored by yangfei about 7 years ago

Exists in master and in 6 other branches

追访数据个节点更新bug第一轮自测bug修改

Showing 9 changed files with 135 additions and 78 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java
platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.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/FolicAcidFacade.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/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java

...	...	@@ -8,6 +8,7 @@
8	8	import org.slf4j.Logger;
9	9	import org.slf4j.LoggerFactory;
10	10	import org.springframework.beans.factory.annotation.Autowired;
	11	+import org.springframework.data.domain.Sort;
11	12	import org.springframework.stereotype.Service;
12	13
13	14	import java.util.Date;
14	15
...	...	@@ -65,11 +66,12 @@
65	66
66	67	public List<TrackDownRecord> queryTrackDown(TrackDownRecordQuery query) {
67	68	MongoQuery query1 = query.convertToQuery();
	69	+
68	70	if (StringUtils.isNotEmpty(query.getNeed())) {
69	71	query.mysqlBuild(iTrackDownRecordDao.queryTrackDownCount(query1));
70	72	query1.start(query.getOffset()).end(query.getLimit());
71	73	}
72		- return iTrackDownRecordDao.queryTrackDown(query1);
	74	+ return iTrackDownRecordDao.queryTrackDown(query1.addOrder(Sort.Direction.DESC, "modified"));
73	75	}
74	76	}

...	...	@@ -37,6 +37,8 @@
37	37	private List<String> pids;
38	38	private String hospitalId;
39	39	private String residentsArchiveId;
	40	+ private String source;
	41	+ private String status;
40	42	/**
41	43	* 末次月经
42	44	*/
...	...	@@ -51,6 +53,22 @@
51	53	return trackTypes;
52	54	}
53	55
	56	+ public String getSource() {
	57	+ return source;
	58	+ }
	59	+
	60	+ public void setSource(String source) {
	61	+ this.source = source;
	62	+ }
	63	+
	64	+ public String getStatus() {
	65	+ return status;
	66	+ }
	67	+
	68	+ public void setStatus(String status) {
	69	+ this.status = status;
	70	+ }
	71	+
54	72	public void setTrackTypes(List trackTypes) {
55	73	this.trackTypes = trackTypes;
56	74	}
...	...	@@ -153,6 +171,14 @@
153	171	@Override
154	172	public MongoQuery convertToQuery() {
155	173	MongoCondition condition=MongoCondition.newInstance();
	174	+
	175	+ if(StringUtils.isNotEmpty(status)){
	176	+ condition= condition.and("status",status, MongoOper.IS);
	177	+ }else{
	178	+ //默认只查询显示的数据
	179	+ condition= condition.and("status",1, MongoOper.IS);
	180	+ }
	181	+
156	182	if(StringUtils.isNotEmpty(provinceId)){
157	183	condition= condition.and("provinceId",provinceId, MongoOper.IS);
158	184	}
...	...	@@ -177,8 +203,19 @@
177	203	if (null != trackTypes) {
178	204	condition = condition.and("trackType", trackTypes, MongoOper.IN);
179	205	}
180		- if(StringUtils.isNotEmpty(parentId)){
181		- condition = condition.and("parentId", parentId, MongoOper.IS);
	206	+
	207	+ if(StringUtils.isNotEmpty(source)&&StringUtils.isNotEmpty(parentId)){
	208	+ MongoCondition con1 = MongoCondition.newInstance("source", source, MongoOper.IS);
	209	+ MongoCondition con2 = MongoCondition.newInstance("parentId", parentId, MongoOper.IS);
	210	+ condition = condition.orCondition(new MongoCondition[]{con1, con2});
	211	+
	212	+ }else {
	213	+ if (StringUtils.isNotEmpty(source)) {
	214	+ condition = condition.and("source", source, MongoOper.IS);
	215	+ }
	216	+ if (StringUtils.isNotEmpty(parentId)) {
	217	+ condition = condition.and("parentId", parentId, MongoOper.IS);
	218	+ }
182	219	}
183	220	if (null != pids) {
184	221	condition = condition.and("pid", pids, MongoOper.IN);

...	...	@@ -145,6 +145,10 @@
145	145	private ITrackDownService trackDownService;
146	146	@Autowired
147	147	private TrackDownRecordService trackDownRecordService;
	148	+
	149	+ @Autowired
	150	+ private ResidentsArchiveService residentsArchiveService;
	151	+
148	152	/**
149	153	* 根据患者的建档ID，查询还未使用的免费产检查券
150	154	*
151	155
152	156
153	157
154	158
...	...	@@ -277,27 +281,46 @@
277	281
278	282	//添加产后追访信息
279	283	TrackDownRecord trackDownRecord = patient.build();
280		- //添加产后追访信息
281		- TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
282		- downRecordQuery.setParentId(trackDownRecord.getParentId());
283	284
284		- List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
285		- if(CollectionUtils.isNotEmpty(records)){
286		- TrackDownRecord trackDownRecord1 = records.get(0);
287		- if(trackDownRecord1.getStatus()==1&&trackDownRecord.getTrackType()!=TrackDownDateEnums.C.getId()){
288		- trackDownRecord.setHospitalId(yunRequest.getHospitalId());
289		- trackDownRecord.setSource(patient.getId());
290		- trackDownRecord.setTrackType(TrackDownDateEnums.C.getId());
291		- trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord);
	285	+
	286	+ ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
	287	+ archiveQuery.setYn(YnEnums.YES.getId());
	288	+ archiveQuery.setHospitalId(yunRequest.getHospitalId());
	289	+
	290	+ boolean isSaveTrack = true;
	291	+
	292	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(patient.getCardNo())) {
	293	+ archiveQuery.setCertificateNum(patient.getCardNo());
	294	+ List<ResidentsArchiveModel> residents = residentsArchiveService.queryResident(archiveQuery);
	295	+ if (CollectionUtils.isNotEmpty(residents) && residents.get(0) != null) {
	296	+ ResidentsArchiveModel archiveModel = residents.get(0);
	297	+ //添加产后追访信息
	298	+ TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
	299	+ downRecordQuery.setSource(archiveModel.getId());
	300	+ List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
	301	+ if (CollectionUtils.isNotEmpty(records)) {//修改
	302	+ TrackDownRecord trackDownRecord1 = records.get(0);
	303	+ if (trackDownRecord1.getStatus() == 1 && trackDownRecord1.getTrackType() < TrackDownDateEnums.C.getId()) {
	304	+ trackDownRecord.setHospitalId(yunRequest.getHospitalId());
	305	+ trackDownRecord.setSource(trackDownRecord1.getId());
	306	+ trackDownRecord.setTrackType(TrackDownDateEnums.C.getId());
	307	+ trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord);
	308	+ isSaveTrack = false;
	309	+ }
	310	+ }
292	311	}
293		- }else{
	312	+ }
	313	+
	314	+ //新增
	315	+ if(isSaveTrack){
294	316	trackDownRecord.setHospitalId(yunRequest.getHospitalId());
295	317	trackDownRecord.setSource(patient.getId());
296	318	trackDownRecord.setStatus(1);
297	319	trackDownRecord.setTrackType(TrackDownDateEnums.C.getId());
298		- trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord);
	320	+ trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord);
299	321	}
300	322
	323	+
301	324	operateLogFacade.addAddOptLog(userId, Integer.valueOf(yunRequest.getHospitalId()), p, OptActionEnums.ADD.getId(), "孕妇建档");
302	325
303	326	/** 孕妇建档后把所有以前未使用的优惠券作废 */
...	...	@@ -383,7 +406,7 @@
383	406	patientService.setCreateDate(DateUtil.parseYMD(yunRequest.getBookbuildingDate()));
384	407	patientService.setParentid(p.getId());
385	408	try {
386		- patientServiceFacade.addPatientService(patientService, userId,yunRequest.getHospitalId());
	409	+ patientServiceFacade.addPatientService(patientService, userId, yunRequest.getHospitalId());
387	410	} catch (Exception e) {
388	411	System.out.println("孕妇建档服务开通异常！");
389	412	e.printStackTrace();
390	413
391	414
392	415
393	416
...	...	@@ -535,20 +558,20 @@
535	558	downRecordQuery.setParentId(trackDownRecord.getParentId());
536	559
537	560	List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
538		- if(CollectionUtils.isNotEmpty(records)){
	561	+ if (CollectionUtils.isNotEmpty(records)) {
539	562	TrackDownRecord trackDownRecord1 = records.get(0);
540		- if(trackDownRecord1.getStatus()==1&&trackDownRecord.getTrackType()!=TrackDownDateEnums.C.getId()){
	563	+ if (trackDownRecord1.getStatus() == 1 && trackDownRecord.getTrackType() != TrackDownDateEnums.C.getId()) {
541	564	trackDownRecord.setHospitalId(yunRequest.getHospitalId());
542	565	trackDownRecord.setSource(patient.getId());
543	566	trackDownRecord.setTrackType(TrackDownDateEnums.C.getId());
544		- trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord);
	567	+ trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord);
545	568	}
546		- }else{
	569	+ } else {
547	570	trackDownRecord.setHospitalId(yunRequest.getHospitalId());
548	571	trackDownRecord.setSource(patient.getId());
549	572	trackDownRecord.setStatus(1);
550	573	trackDownRecord.setTrackType(TrackDownDateEnums.C.getId());
551		- trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord);
	574	+ trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord);
552	575	}
553	576
554	577
555	578
556	579
...	...	@@ -656,17 +679,14 @@
656	679	if (templateModel != null && templateModel.getStatus() == 1) {
657	680
658	681	//推送类型模板
659		- if (templateModel.getTemplateType() == null \|\| templateModel.getTemplateType() == 0)
660		- {
	682	+ if (templateModel.getTemplateType() == null \|\| templateModel.getTemplateType() == 0) {
661	683	//发送推送类模板建档
662		- if (startType == 3)
663		- {
	684	+ if (startType == 3) {
664	685	continue;
665	686	}
666	687	}
667	688	//发送短信类模板建档
668		- else if(templateModel.getTemplateType() == 1 && startType == 1)
669		- {
	689	+ else if (templateModel.getTemplateType() == 1 && startType == 1) {
670	690	continue;
671	691	}
672	692
...	...	@@ -700,7 +720,7 @@
700	720	messages.add(mr);
701	721	ExceptionUtils.catchException("patient build msg = " + messages);
702	722	if (CollectionUtils.isNotEmpty(messages)) {
703		- smsConfigFacade.saveMsg(messages,patient.getHospitalId());
	723	+ smsConfigFacade.saveMsg(messages, patient.getHospitalId());
704	724	}
705	725	}
706	726	}
...	...	@@ -725,7 +745,6 @@
725	745	*/
726	746	public BaseResponse updatePregnantById(String id, YunBookbuildingAddRequest yunRequest, Integer userId) {
727	747
728		-
729	748	BaseResponse br = new BaseResponse();
730	749	PatientsQuery patientsQuery = new PatientsQuery();
731	750	patientsQuery.setYn(YnEnums.YES.getId());
...	...	@@ -834,7 +853,7 @@
834	853
835	854	//更新产后追访信息
836	855	TrackDownRecord trackDownRecord = patient.build();
837		- trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord);
	856	+ trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord);
838	857
839	858	operateLogFacade.addModifyOptLog(userId, Integer.valueOf(beforePatient.getHospitalId()), beforePatient, patient, OptActionEnums.UPDATE.getId(), "孕妇建档修改");
840	859
841	860
...	...	@@ -892,12 +911,9 @@
892	911	String hospitalId = autoMatchFacade.getHospitalId(userId);
893	912
894	913	//德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号）查询出对应的用过的卡号 add lqy
895		- if ("1000000114".equals(hospitalId))
896		- {
	914	+ if ("1000000114".equals(hospitalId)) {
897	915	patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(bookbuildingQueryRequest.getVcCardNo()));
898		- }
899		- else
900		- {
	916	+ } else {
901	917	patientsQuery.setVcCardNo(bookbuildingQueryRequest.getVcCardNo());
902	918	}
903	919
...	...	@@ -1179,7 +1195,7 @@
1179	1195	if (Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.bzfw.getId()) {
1180	1196	patient.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
1181	1197	patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
1182		- }else if(Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.yqjzzd.getId()){//增值服务：修改为孕期精准指导
	1198	+ } else if (Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.yqjzzd.getId()) {//增值服务：修改为孕期精准指导
1183	1199	patient.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
1184	1200	patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
1185	1201	break;
...	...	@@ -1217,7 +1233,7 @@
1217	1233	Patients p = patients.get(0);
1218	1234	result = getResult(p);
1219	1235	/** 末次月经和纠正末次月经反起来返回 */
1220		- if(p.getFuckLastMens() != null) {
	1236	+ if (p.getFuckLastMens() != null) {
1221	1237	result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getLastMenses()));
1222	1238	result.setLastMenstrualPeriod(DateUtil.getyyyy_MM_dd(p.getFuckLastMens()));
1223	1239	}
...	...	@@ -1929,7 +1945,7 @@
1929	1945	}
1930	1946
1931	1947
1932		- public String getPatientBuildId(String certType, String certNo,String hospitalId,Integer valueType) {
	1948	+ public String getPatientBuildId(String certType, String certNo, String hospitalId, Integer valueType) {
1933	1949	PatientsQuery patientsQuery = new PatientsQuery();
1934	1950	patientsQuery.setCardNo(certNo);
1935	1951	patientsQuery.setPcerteTypeId(certType);
1936	1952
1937	1953
1938	1954
...	...	@@ -1937,18 +1953,13 @@
1937	1953	patientsQuery.setHospitalId(hospitalId);
1938	1954	List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
1939	1955	String patientId = "";
1940		- if (CollectionUtils.isNotEmpty(patients))
1941		- {
	1956	+ if (CollectionUtils.isNotEmpty(patients)) {
1942	1957	patientId = patients.get(0).getId();
1943		- if (valueType == 1)
1944		- {
	1958	+ if (valueType == 1) {
1945	1959	PatientWeight pw = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.get(0).getPid())), PatientWeight.class);
1946		- if (pw == null)
1947		- {
	1960	+ if (pw == null) {
1948	1961	patientId = "";
1949		- }
1950		- else
1951		- {
	1962	+ } else {
1952	1963	patientId = pw.getPatientId();
1953	1964	}
1954	1965	}

...	...	@@ -3,7 +3,6 @@
3	3	import com.lyms.platform.biz.service.*;
4	4	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	5	import com.lyms.platform.common.enums.OptActionEnums;
6		-import com.lyms.platform.common.enums.TrackDownDateEnums;
7	6	import com.lyms.platform.common.enums.YnEnums;
8	7	import com.lyms.platform.common.result.BaseListResponse;
9	8	import com.lyms.platform.common.result.BaseObjectResponse;
10	9
...	...	@@ -132,11 +131,10 @@
132	131	model.setVcCardNo(addRequest.getVcCardNo());
133	132
134	133	ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.addResident(model);
	134	+
135	135	//新增婚检追访信息
136	136	TrackDownRecord record = residentsArchiveModel.build();
137		- record.setStatus(1);
138		- record.setTrackType(TrackDownDateEnums.A.getId());
139		- trackDownService.addOrupdateTrackDownRecord(userId,residentsArchiveModel.build());
	137	+ trackDownService.addOrupdateTrackDownRecord(userId,record);
140	138	id = addOrUpdate(addRequest,userId,residentsArchiveModel.getId());
141	139	}else {
142	140	id = addOrUpdate(addRequest,userId,addRequest.getParentId());

...	...	@@ -255,7 +255,7 @@
255	255	babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
256	256	babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
257	257	babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest);
258		- }else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId().intValue() == ps.getSerType().intValue()) {
	258	+ }else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) {
259	259	BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest();
260	260	babyBookbuildingAddRequest.setId(ps.getParentid());
261	261	babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
...	...	@@ -268,7 +268,7 @@
268	268	yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
269	269	yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
270	270	bookbuildingFacade.updatePregnantById(ps.getParentid(), yunBookbuildingAddRequest, userId);
271		- }else if(PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == ps.getSerType().intValue()){
	271	+ }else if(PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))){
272	272	YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest();
273	273	yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
274	274	yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());

...	...	@@ -736,22 +736,23 @@
736	736	checkup.setHospitalId(addRequest.getHospitalId());
737	737	PremaritalCheckup premaritalCheckup = premaritalCheckupService.addPremaritalCheckup(checkup);
738	738	id = premaritalCheckup.getId();
	739	+ }
739	740
740		- //新增婚前检查结束,男的结束流程，女的进入怀孕建档）
741		- if (model.getSex().equals(SystemConfig.WOMAN_ID)) {
742		- //新增婚检追访信息
743		- TrackDownRecord record = model.build();
744		- record.setStatus(1);
745		- record.setTrackType(TrackDownDateEnums.B.getId());
746		- trackDownService.addOrupdateTrackDownRecord(userId,record);
747		- } else if (model.getSex().equals(SystemConfig.MAN_ID)) {
748		- //新增婚检追访信息
749		- TrackDownRecord record = model.build();
750		- record.setStatus(0);
751		- trackDownService.addOrupdateTrackDownRecord(userId,record);
752		- }
753		-
	741	+ //新增婚前检查结束,男的结束流程，女的进入怀孕建档）
	742	+ if (model.getSex().equals(SystemConfig.WOMAN_ID)) {
	743	+ //新增婚检追访信息
	744	+ TrackDownRecord record = model.build();
	745	+ record.setStatus(1);
	746	+ record.setTrackType(TrackDownDateEnums.B.getId());
	747	+ trackDownService.addOrupdateTrackDownRecord(userId,record);
	748	+ } else if (model.getSex().equals(SystemConfig.MAN_ID)) {
	749	+ //新增婚检追访信息
	750	+ TrackDownRecord record = model.build();
	751	+ record.setStatus(0);
	752	+ record.setTrackType(TrackDownDateEnums.A.getId());
	753	+ trackDownService.addOrupdateTrackDownRecord(userId,record);
754	754	}
	755	+
755	756	return id;
756	757	}
757	758

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.BasicConfigService;
5		-import com.lyms.platform.biz.service.PremaritalCheckupService;
6		-import com.lyms.platform.biz.service.ResidentsArchiveService;
7		-import com.lyms.platform.biz.service.SyncDataService;
	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;
...	...	@@ -68,6 +65,8 @@
68	65	private SyncDataService syncDataService;
69	66	@Autowired
70	67	private ITrackDownService trackDownService;
	68	+ @Autowired
	69	+ private TrackDownRecordService trackDownRecordService;
71	70
72	71	public BaseObjectResponse findResidentsArchive(ResidentsArchiveQueryRequest queryRequest,Integer userId){
73	72
...	...	@@ -82,7 +81,6 @@
82	81	residents = residentsArchiveService.queryResident(archiveQuery);
83	82	}else if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())){
84	83	//通过用户ID查询医院ID
85		-
86	84	archiveQuery.setVcCardNo(queryRequest.getVcCardNo());
87	85	archiveQuery.setHospitalId(hospitalId);
88	86	List<ResidentsArchiveModel> archiveModelList = residentsArchiveService.queryResident(archiveQuery);
89	87
...	...	@@ -298,8 +296,10 @@
298	296
299	297	model.setId(id);
300	298	residentsArchiveService.updateResident(model,id);
	299	+
	300	+ TrackDownRecord record = model.build();
301	301	//修改追访基本信息
302		- trackDownService.addOrupdateTrackDownRecord(userId,model.build());
	302	+ trackDownService.addOrupdateTrackDownRecord(userId,record);
303	303
304	304	}catch (Exception e){
305	305	return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg("系统异常,修改数据失败");
...	...	@@ -384,9 +384,7 @@
384	384
385	385	//新增婚检追访信息
386	386	TrackDownRecord record = residentsArchiveModel.build();
387		- record.setStatus(1);
388		- record.setTrackType(TrackDownDateEnums.A.getId());
389		- trackDownService.addOrupdateTrackDownRecord(userId,residentsArchiveModel.build());
	387	+ trackDownService.addOrupdateTrackDownRecord(userId,record);
390	388
391	389	if (residentsArchiveModel == null \|\| StringUtils.isEmpty(residentsArchiveModel.getId())){
392	390	br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);

...	...	@@ -129,7 +129,7 @@
129	129	downRecordQuery.setPage(downQueryRequest.getPage());
130	130	downRecordQuery.setLimit(downQueryRequest.getLimit());
131	131	downRecordQuery.setNeed("1");
132		- downRecordQuery.setSort("modified desc");
	132	+ // downRecordQuery.setSort("modified desc");
133	133	downRecordQuery.setHospitalId(autoMatchFacade.getHospitalId(userId));
134	134	return downRecordQuery;
135	135	}

...	...	@@ -184,16 +184,26 @@
184	184	public boolean addOrupdateTrackDownRecord(Integer userId, TrackDownRecord trackDownRecord) {
185	185	try {
186	186	TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
	187	+ downRecordQuery.setSource(trackDownRecord.getSource());
187	188	downRecordQuery.setParentId(trackDownRecord.getParentId());
188	189	List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
189	190	if(CollectionUtils.isNotEmpty(records)){
190	191	TrackDownRecord trackDownRecord1 = records.get(0);
	192	+ //流程只能往下流转，不能往上回退
	193	+ if(trackDownRecord.getTrackType()!=null&&trackDownRecord1.getTrackType().intValue()>trackDownRecord.getTrackType()){
	194	+ trackDownRecord.setTrackType(trackDownRecord1.getTrackType());
	195	+ }
	196	+ //由显示修改成不显示，后期数据更新时，不允许将不显示修改成显示。
	197	+ if(trackDownRecord1.getStatus()>trackDownRecord.getStatus()){
	198	+ trackDownRecord1.setStatus(trackDownRecord.getStatus());
	199	+ }
191	200	trackDownRecordService.updateTrackDown(trackDownRecord,trackDownRecord1.getId());
192	201	}else{
193	202	trackDownRecordService.addTrackDown(trackDownRecord);
194	203	}
195	204	return true;
196	205	}catch (Exception e){
	206	+ e.printStackTrace();
197	207	return false;
198	208	}
199	209	}