diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITempDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITempDao.java index b3aca15..4a84e65 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITempDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITempDao.java @@ -27,4 +27,6 @@ public interface ITempDao { void updateFirst(TempModel temp, String id); int queryTempModelCount(MongoQuery query); + + TempModel findOneById(String id); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TempDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TempDaoImpl.java index 64681ec..a14fbad 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TempDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TempDaoImpl.java @@ -30,9 +30,6 @@ import java.util.List; @Repository("tempDao") public class TempDaoImpl extends BaseMongoDAOImpl implements ITempDao { - //日志调测器 - private static final Logger logger = LoggerFactory.getLogger(TempDaoImpl.class); - @Override public TempModel addOneTemp(TempModel target) { return save(target); @@ -52,4 +49,8 @@ public class TempDaoImpl extends BaseMongoDAOImpl implements ITempDao public int queryTempModelCount(MongoQuery query) { return (int) count(query.convertToMongoQuery()); } + + public TempModel findOneById(String id){ + return findById(id); + } } \ No newline at end of file diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TempService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TempService.java index 6eb1fd4..1e76bee 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TempService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TempService.java @@ -33,9 +33,6 @@ import java.util.List; @Service public class TempService { - //日志调测器 - private static final Logger logger = LoggerFactory.getLogger(TempService.class); - @Autowired private ITempDao tempDao; @@ -58,4 +55,8 @@ public class TempService { temp.setModified(new Date()); tempDao.updateFirst(temp,id); } + + public TempModel findOneById(String id){ + return tempDao.findOneById(id); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java index 6cddd75..b74e733 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java @@ -11,6 +11,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; @@ -68,6 +69,20 @@ public class TempController extends BaseController { @ResponseBody public BaseResponse findTempDataList(@Valid TempQueryRequest queryRequest,HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return tempFacade.findTempDataList(queryRequest,loginState.getId()); + return tempFacade.findTempDataList(queryRequest, loginState.getId()); + } + + + /** + * 查看报告 + * + * @return + */ + @TokenRequired + @RequestMapping(value = "/report/{id}",method = RequestMethod.GET) + @ResponseBody + public BaseResponse report(@PathVariable String id,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return tempFacade.reportList(loginState.getId(),id); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java index 034edcc..beaf638 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java @@ -6,6 +6,7 @@ import com.lyms.platform.common.base.ContextHolder; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.Assert; import com.lyms.platform.common.utils.DateUtil; @@ -55,10 +56,10 @@ public class TempFacade { @Autowired private MongoUtil mongoUtil; - public BaseResponse addOrUpdateOneTemp(TempAddRequest addRequest,Integer userId) { + public BaseResponse addOrUpdateOneTemp(TempAddRequest addRequest, Integer userId) { Assert.notNull(addRequest, "请求为空."); - String hospital =autoMatchFacade.getHospitalId(userId); - String parentId=mongoUtil.doHidePatient(addRequest.getParentId(), hospital); + String hospital = autoMatchFacade.getHospitalId(userId); + String parentId = mongoUtil.doHidePatient(addRequest.getParentId(), hospital); addRequest.setParentId(parentId); TempQuery tempQuery = new TempQuery(); tempQuery.setYn(YnEnums.YES.getId()); @@ -69,28 +70,28 @@ public class TempFacade { tempQuery.setHospitalList(list); TempModel tempModel = addRequest.convertToDataModel(); - tempModel.setOperator(userId+""); + tempModel.setOperator(userId + ""); tempModel.sethId(hospital); List temp = tempService.queryTemp(tempQuery); if (CollectionUtils.isNotEmpty(temp)) { - LinkedHashMap data =temp.get(0).getTempList(); - if(null==data){ - data =new LinkedHashMap(); + LinkedHashMap data = temp.get(0).getTempList(); + if (null == data) { + data = new LinkedHashMap(); } - data.put(DateUtil.getYyyyMmDd(new Date()),Double.valueOf(addRequest.getTemp())); + data.put(DateUtil.getYyyyMmDd(new Date()), Double.valueOf(addRequest.getTemp())); temp.get(0).setTempList(data); tempService.update(temp.get(0), temp.get(0).getId()); } else { - LinkedHashMap data =new LinkedHashMap<>(); - data.put(DateUtil.getYyyyMmDd(new Date()),Double.valueOf(addRequest.getTemp())); + LinkedHashMap data = new LinkedHashMap<>(); + data.put(DateUtil.getYyyyMmDd(new Date()), Double.valueOf(addRequest.getTemp())); tempModel.setTempList(data); tempService.addOneTemp(tempModel); } return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } - public BaseResponse findTempDataList(TempQueryRequest queryRequest,Integer userId) { + public BaseResponse findTempDataList(TempQueryRequest queryRequest, Integer userId) { String hospital = autoMatchFacade.getHospitalId(userId); PatientsQuery patientsQuery = new PatientsQuery(); @@ -116,9 +117,9 @@ public class TempFacade { if (CollectionUtils.isEmpty(patientses)) { return new BaseListResponse().setData(new ArrayList()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - List pids= new ArrayList<>(); - for(Patients patients:patientses){ - if(StringUtils.isNotEmpty(patients.getPid())){ + List pids = new ArrayList<>(); + for (Patients patients : patientses) { + if (StringUtils.isNotEmpty(patients.getPid())) { pids.add(patients.getPid()); } } @@ -135,12 +136,12 @@ public class TempFacade { tempQuery.setHospitalList(list); List temp = tempService.queryTemp(tempQuery); - List dataList =new ArrayList(); - if(CollectionUtils.isNotEmpty(temp)){ - for(TempModel tmp:temp){ - if(StringUtils.isNotEmpty(tmp.getParentId())){ - Patients patients =patientsService.findOnePatientById(tmp.getParentId()); - if(patients != null) { + List dataList = new ArrayList(); + if (CollectionUtils.isNotEmpty(temp)) { + for (TempModel tmp : temp) { + if (StringUtils.isNotEmpty(tmp.getParentId())) { + Patients patients = patientsService.findOnePatientById(tmp.getParentId()); + if (patients != null) { Map data = new LinkedHashMap<>(); data.put("id", tmp.getId()); data.put("username", patients.getUsername()); @@ -157,4 +158,34 @@ public class TempFacade { } return new BaseListResponse().setData(dataList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + + + /** + * 封装报告 + * + * @param userId 用户id + * @param id 记录id + * @return + */ + public BaseResponse reportList(Integer userId, String id) { + TempModel tem = tempService.findOneById(id); + Assert.notNull(tem, "查看的记录已被删除"); + LinkedHashMap data = tem.getTempList(); + if (null == data || data.isEmpty()) { + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + /* Set> set = data.entrySet(); + + ArrayList> da = new ArrayList>(set); + Collections.reverse(da);*/ + ; + List time = new ArrayList<>(); + List temp=new ArrayList<>(); + for (int i = 0; i < 7; i++) { + String t = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(), -i)); + time.add(t); + temp.add(String.valueOf(data.get(t))); + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } } \ No newline at end of file