diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverFollowService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverFollowService.java index 7b8da56..a9dde56 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverFollowService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverFollowService.java @@ -31,7 +31,7 @@ public class MatDeliverFollowService { } public List query(MatDeliverFollowQuery deliverQuery){ - return iMatdeliverFollowModelDao.queryMatdeliverFollowModel(deliverQuery.convertToQuery().addOrder(Sort.Direction.ASC, "updateDate")); + return iMatdeliverFollowModelDao.queryMatdeliverFollowModel(deliverQuery.convertToQuery().addOrder(Sort.Direction.ASC, "createDate")); } public void deleteOne(String id){ iMatdeliverFollowModelDao.deleteMatdeliverFollowModel(id); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java index 82e83c4..8d93164 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java @@ -184,6 +184,31 @@ public class MatdeliverFollowModel extends BaseModel { */ private String updateUser; + /** + * 创建时间 + */ + private Date createDate; + /** + * 创建人 + */ + private String createUser; + + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + public Date getUpdateDate() { return updateDate; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java index 97b860b..6b004dd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java @@ -77,6 +77,11 @@ public class MatdeliverFollowController extends BaseController { return matdeliverFollowFacade.findPostpartumFollowMakeList(pid, id, loginState.getId()); } + /** + * 根据id查询分娩随访 + * @param id + * @return + */ @ResponseBody @TokenRequired @RequestMapping(value = "/{id}", method = RequestMethod.GET) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java index 836a9cd..0f007e7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.MatDeliverFollowService; import com.lyms.platform.biz.service.MatDeliverService; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.OptActionEnums; import com.lyms.platform.common.enums.PostpartumFollowMakeEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; @@ -44,6 +45,10 @@ public class MatdeliverFollowFacade { private UsersService usersService; @Autowired private OrganizationService organizationService; + @Autowired + private AutoMatchFacade autoMatchFacade; + @Autowired + private OperateLogFacade operateLogFacade; public BaseResponse matdeliverFollowMakeInit(Integer id) { Map map = new HashMap(); @@ -91,7 +96,9 @@ public class MatdeliverFollowFacade { if (CollectionUtils.isNotEmpty(maternalDeliverList)) { for (MatdeliverFollowModel md : maternalDeliverList) { Map map = new HashMap<>(); - map.put("time", DateUtil.getyyyy_MM_dd(md.getVisitCreateDate()==null?md.getUpdateDate():md.getVisitCreateDate())); + // map.put("time", DateUtil.getyyyy_MM_dd(md.getVisitCreateDate()==null?md.getUpdateDate():md.getVisitCreateDate())); + //创建时间 + map.put("time", DateUtil.getyyyy_MM_dd(md.getCreateDate())); map.put("title", "访视记录"); map.put("id", md.getId()); map.put("hospitalId", md.getHospitalId()); @@ -145,11 +152,16 @@ public class MatdeliverFollowFacade { //有访视结果时，则就是已访视状态 if(matDeliverFollowAddRequest.getVisitResult() != null){ matDeliverFollowAddRequest.setVisitStatus(2); + matDeliverFollowAddRequest.setVisitCreateUser(String.valueOf(userId)); + matDeliverFollowAddRequest.setVisitCreateDateStr(new Date()); } if (StringUtils.isNotEmpty(matDeliverFollowAddRequest.getId())) {//修改 matDeliverFollowAddRequest.setMakeCreateUser(null); matDeliverFollowAddRequest.setMakeCreateDate(null); + + MatdeliverFollowModel before = matDeliverFollowService.getOneMatDeliverFollow(matDeliverFollowAddRequest.getId()); + //修改随访信息 matDeliverFollowService.updateOne(matDeliverFollowAddRequest.convertToDataModel(), matDeliverFollowAddRequest.getId()); @@ -159,13 +171,21 @@ public class MatdeliverFollowFacade { //如果修改的是最后一次随访记录，则进行同步修改分娩记录里的随访信息 if (matDeliverFollowAddRequest.getId().equals(maternalDeliverModel.getMatFollowId())) { updateMaternalDeliver(matDeliverFollowAddRequest,maternalDeliverModel); - baseResponse.setObject(matDeliverFollowAddRequest.getId()); } + baseResponse.setObject(matDeliverFollowAddRequest.getId()); + + String hospitalId = autoMatchFacade.getHospitalId(userId); + + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before, matDeliverFollowAddRequest.convertToDataModel(), OptActionEnums.UPDATE.getId(), "修复访视记录"); + } else {//新增随访记录，并同步更新分娩记录里的随访信息 //预约操作信息 matDeliverFollowAddRequest.setId(null); matDeliverFollowAddRequest.setMakeCreateUser(String.valueOf(userId)); matDeliverFollowAddRequest.setMakeCreateDate(new Date()); + matDeliverFollowAddRequest.setCreateUser(String.valueOf(userId)); + matDeliverFollowAddRequest.setCreateDate(new Date()); + //新增随访记录 MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.addMatDeliverFollow(matDeliverFollowAddRequest.convertToDataModel()); @@ -179,6 +199,9 @@ public class MatdeliverFollowFacade { log.error("分娩记录随访没有找到随访记录，传入随访id："+matDeliverFollowAddRequest.getDeliverId()); } baseResponse.setObject(matdeliverFollowModel.getId()); + + String hospitalId = autoMatchFacade.getHospitalId(userId); + operateLogFacade.addAddOptLog(userId, Integer.valueOf(hospitalId), matdeliverFollowModel, OptActionEnums.ADD.getId(), "新增访视记录"); } baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -285,7 +308,7 @@ public class MatdeliverFollowFacade { } } - //访视医生 + //访视操作员 if (StringUtils.isNotEmpty(matdeliverFollowResult.getVisitCreateUser())) { try { Users users = usersService.getUsers(Integer.parseInt(matdeliverFollowResult.getVisitCreateUser())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index ed15dcd..aa22903 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -378,6 +378,8 @@ public class PatientFacade { patientsQuery.setProvinceId(riskPatientsQueryRequest.getProvinceRegisterId()); patientsQuery.setCityId(riskPatientsQueryRequest.getCityRegisterId()); patientsQuery.setStreetId(riskPatientsQueryRequest.getStreetRegisterId()); + + List hospitalList = null; List fmHospitalList = null; //区域范围内孕妇 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java index ad433be..72832d9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java @@ -194,6 +194,15 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert