jiangjiazhi / regional-platform

Commit 34e796bea2cdc9524ded6ccc9750c64522f3e106

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

产后随访

Showing 6 changed files with 84 additions and 4 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverFollowService.java
platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.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/MatDeliverFollowAddRequest.java

...	...	@@ -31,7 +31,7 @@
31	31	}
32	32
33	33	public List<MatdeliverFollowModel> query(MatDeliverFollowQuery deliverQuery){
34		- return iMatdeliverFollowModelDao.queryMatdeliverFollowModel(deliverQuery.convertToQuery().addOrder(Sort.Direction.ASC, "updateDate"));
	34	+ return iMatdeliverFollowModelDao.queryMatdeliverFollowModel(deliverQuery.convertToQuery().addOrder(Sort.Direction.ASC, "createDate"));
35	35	}
36	36	public void deleteOne(String id){
37	37	iMatdeliverFollowModelDao.deleteMatdeliverFollowModel(id);

...	...	@@ -184,6 +184,31 @@
184	184	*/
185	185	private String updateUser;
186	186
	187	+ /**
	188	+ * 创建时间
	189	+ */
	190	+ private Date createDate;
	191	+ /**
	192	+ * 创建人
	193	+ */
	194	+ private String createUser;
	195	+
	196	+ public Date getCreateDate() {
	197	+ return createDate;
	198	+ }
	199	+
	200	+ public void setCreateDate(Date createDate) {
	201	+ this.createDate = createDate;
	202	+ }
	203	+
	204	+ public String getCreateUser() {
	205	+ return createUser;
	206	+ }
	207	+
	208	+ public void setCreateUser(String createUser) {
	209	+ this.createUser = createUser;
	210	+ }
	211	+
187	212	public Date getUpdateDate() {
188	213	return updateDate;
189	214	}

...	...	@@ -77,6 +77,11 @@
77	77	return matdeliverFollowFacade.findPostpartumFollowMakeList(pid, id, loginState.getId());
78	78	}
79	79
	80	+ /**
	81	+ * 根据id查询分娩随访
	82	+ * @param id
	83	+ * @return
	84	+ */
80	85	@ResponseBody
81	86	@TokenRequired
82	87	@RequestMapping(value = "/{id}", method = RequestMethod.GET)

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.biz.service.MatDeliverFollowService;
4	4	import com.lyms.platform.biz.service.MatDeliverService;
5	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
	6	+import com.lyms.platform.common.enums.OptActionEnums;
6	7	import com.lyms.platform.common.enums.PostpartumFollowMakeEnums;
7	8	import com.lyms.platform.common.result.BaseListResponse;
8	9	import com.lyms.platform.common.result.BaseObjectResponse;
...	...	@@ -44,6 +45,10 @@
44	45	private UsersService usersService;
45	46	@Autowired
46	47	private OrganizationService organizationService;
	48	+ @Autowired
	49	+ private AutoMatchFacade autoMatchFacade;
	50	+ @Autowired
	51	+ private OperateLogFacade operateLogFacade;
47	52
48	53	public BaseResponse matdeliverFollowMakeInit(Integer id) {
49	54	Map map = new HashMap();
...	...	@@ -91,7 +96,9 @@
91	96	if (CollectionUtils.isNotEmpty(maternalDeliverList)) {
92	97	for (MatdeliverFollowModel md : maternalDeliverList) {
93	98	Map<String, String> map = new HashMap<>();
94		- map.put("time", DateUtil.getyyyy_MM_dd(md.getVisitCreateDate()==null?md.getUpdateDate():md.getVisitCreateDate()));
	99	+ // map.put("time", DateUtil.getyyyy_MM_dd(md.getVisitCreateDate()==null?md.getUpdateDate():md.getVisitCreateDate()));
	100	+ //创建时间
	101	+ map.put("time", DateUtil.getyyyy_MM_dd(md.getCreateDate()));
95	102	map.put("title", "访视记录");
96	103	map.put("id", md.getId());
97	104	map.put("hospitalId", md.getHospitalId());
98	105
...	...	@@ -145,11 +152,16 @@
145	152	//有访视结果时，则就是已访视状态
146	153	if(matDeliverFollowAddRequest.getVisitResult() != null){
147	154	matDeliverFollowAddRequest.setVisitStatus(2);
	155	+ matDeliverFollowAddRequest.setVisitCreateUser(String.valueOf(userId));
	156	+ matDeliverFollowAddRequest.setVisitCreateDateStr(new Date());
148	157	}
149	158
150	159	if (StringUtils.isNotEmpty(matDeliverFollowAddRequest.getId())) {//修改
151	160	matDeliverFollowAddRequest.setMakeCreateUser(null);
152	161	matDeliverFollowAddRequest.setMakeCreateDate(null);
	162	+
	163	+ MatdeliverFollowModel before = matDeliverFollowService.getOneMatDeliverFollow(matDeliverFollowAddRequest.getId());
	164	+
153	165	//修改随访信息
154	166	matDeliverFollowService.updateOne(matDeliverFollowAddRequest.convertToDataModel(), matDeliverFollowAddRequest.getId());
155	167
156	168
157	169
...	...	@@ -159,13 +171,21 @@
159	171	//如果修改的是最后一次随访记录，则进行同步修改分娩记录里的随访信息
160	172	if (matDeliverFollowAddRequest.getId().equals(maternalDeliverModel.getMatFollowId())) {
161	173	updateMaternalDeliver(matDeliverFollowAddRequest,maternalDeliverModel);
162		- baseResponse.setObject(matDeliverFollowAddRequest.getId());
163	174	}
	175	+ baseResponse.setObject(matDeliverFollowAddRequest.getId());
	176	+
	177	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	178	+
	179	+ operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before, matDeliverFollowAddRequest.convertToDataModel(), OptActionEnums.UPDATE.getId(), "修复访视记录");
	180	+
164	181	} else {//新增随访记录，并同步更新分娩记录里的随访信息
165	182	//预约操作信息
166	183	matDeliverFollowAddRequest.setId(null);
167	184	matDeliverFollowAddRequest.setMakeCreateUser(String.valueOf(userId));
168	185	matDeliverFollowAddRequest.setMakeCreateDate(new Date());
	186	+ matDeliverFollowAddRequest.setCreateUser(String.valueOf(userId));
	187	+ matDeliverFollowAddRequest.setCreateDate(new Date());
	188	+
169	189	//新增随访记录
170	190	MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.addMatDeliverFollow(matDeliverFollowAddRequest.convertToDataModel());
171	191
...	...	@@ -179,6 +199,9 @@
179	199	log.error("分娩记录随访没有找到随访记录，传入随访id："+matDeliverFollowAddRequest.getDeliverId());
180	200	}
181	201	baseResponse.setObject(matdeliverFollowModel.getId());
	202	+
	203	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	204	+ operateLogFacade.addAddOptLog(userId, Integer.valueOf(hospitalId), matdeliverFollowModel, OptActionEnums.ADD.getId(), "新增访视记录");
182	205	}
183	206
184	207	baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
...	...	@@ -285,7 +308,7 @@
285	308	}
286	309	}
287	310
288		- //访视医生
	311	+ //访视操作员
289	312	if (StringUtils.isNotEmpty(matdeliverFollowResult.getVisitCreateUser())) {
290	313	try {
291	314	Users users = usersService.getUsers(Integer.parseInt(matdeliverFollowResult.getVisitCreateUser()));

...	...	@@ -378,6 +378,8 @@
378	378	patientsQuery.setProvinceId(riskPatientsQueryRequest.getProvinceRegisterId());
379	379	patientsQuery.setCityId(riskPatientsQueryRequest.getCityRegisterId());
380	380	patientsQuery.setStreetId(riskPatientsQueryRequest.getStreetRegisterId());
	381	+
	382	+
381	383	List<String> hospitalList = null;
382	384	List<String> fmHospitalList = null;
383	385	//区域范围内孕妇

...	...	@@ -194,6 +194,15 @@
194	194	private String updateUser;
195	195
196	196	/**
	197	+ * 创建时间
	198	+ */
	199	+ private Date createDate;
	200	+ /**
	201	+ * 创建人
	202	+ */
	203	+ private String createUser;
	204	+
	205	+ /**
197	206	* 具体转换实现
198	207	*
199	208	* @return 转换后的model
...	...	@@ -217,6 +226,22 @@
217	226	matdeliverFollowModel.setBp(bpMap);
218	227	}
219	228	return matdeliverFollowModel;
	229	+ }
	230	+
	231	+ public Date getCreateDate() {
	232	+ return createDate;
	233	+ }
	234	+
	235	+ public void setCreateDate(Date createDate) {
	236	+ this.createDate = createDate;
	237	+ }
	238	+
	239	+ public String getCreateUser() {
	240	+ return createUser;
	241	+ }
	242	+
	243	+ public void setCreateUser(String createUser) {
	244	+ this.createUser = createUser;
220	245	}
221	246
222	247	public String getGuideSuggestMap() {