fangcheng / regional-platform

Download as
Browse Code »

Commit b0974444bdc7d5c995bb2621762d4e31cfbeba1f

Authored by jiangjiazhi
1 parent ef7aaea8db
Exists in master and in 1 other branch nobuildprocess

修改新电子病历

Showing 3 changed files with 36 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ b097444
... ... @@ -994,12 +994,29 @@
994 994 * @param antExQueryRequest
995 995 * @return
996 996 */
997   - public BaseResponse delOneAntEx(AntExQueryRequest antExQueryRequest) {
  997 + public BaseResponse delOneAntEx(AntExQueryRequest antExQueryRequest,Integer userId) {
998 998 if ("1".equals(antExQueryRequest.getType())) {
999 999 AntenatalExaminationModel antEx = new AntenatalExaminationModel();
1000 1000 antEx.setYn(YnEnums.NO.getId());
1001 1001 antEx.setId(antExQueryRequest.getId());
1002   - antenatalExaminationService.updateOneAnt(antEx, antExQueryRequest.getId());
  1002 + String hospital = autoMatchFacade.getHospitalId(userId);
  1003 +
  1004 + AntExQuery antExQuery=new AntExQuery();
  1005 + antExQuery.setId(antExQueryRequest.getId());
  1006 + antExQuery.setYn(YnEnums.YES.getId());
  1007 + antExQuery.setHospitalId(hospital);
  1008 + List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
  1009 +
  1010 + if(CollectionUtils.isNotEmpty(list)){
  1011 + antExQuery.setStart(new Date(list.get(0).getCheckDate().getTime()+40000));
  1012 + }
  1013 + antExQuery.setId(null);
  1014 + list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
  1015 + if(CollectionUtils.isEmpty(list)){
  1016 + antenatalExaminationService.updateOneAnt(antEx, antExQueryRequest.getId());
  1017 + }else{
  1018 + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("当前产检记录不是本院最新的产检记录,不能删除");
  1019 + }
1003 1020 } else {
1004 1021 AntExChuModel antExChuModel = new AntExChuModel();
1005 1022 antExChuModel.setYn(YnEnums.NO.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ b097444
... ... @@ -51,6 +51,8 @@
51 51 private OrganizationService organizationService;
52 52 @Autowired
53 53 private ApplyOrderService applyOrderService;
  54 + @Autowired
  55 + private PatientsService patientsService;
54 56  
55 57 /**
56 58 * 增加一条产筛结果记录
... ... @@ -216,6 +218,10 @@
216 218 }
217 219  
218 220 sieveListResult.convertToResult(sieveModel);
  221 + Patients patients= patientsService.findOnePatientById(sieveModel.getParentId());
  222 + if(null!=patients){
  223 + sieveListResult.setIsGravida(patients.getType()==3?"0":"1");
  224 + }
219 225 data.add(sieveListResult);
220 226 }
221 227 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java View file @ b097444
... ... @@ -34,6 +34,17 @@
34 34 //申请时间
35 35 private String applyTime;
36 36  
  37 + //1 孕妇 0 产妇
  38 + private String isGravida="1";
  39 +
  40 + public String getIsGravida() {
  41 + return isGravida;
  42 + }
  43 +
  44 + public void setIsGravida(String isGravida) {
  45 + this.isGravida = isGravida;
  46 + }
  47 +
37 48 public String getApplyTime() {
38 49 return applyTime;
39 50 }