jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8326d7988583991aa7307285aacbb04fb0597ca3

Authored by dongqin
2 parents 5498fa4dc2 034f1e403f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java View file @ 8326d79
... ... @@ -306,8 +306,8 @@
306 306 @RequestMapping(value = "/updateLastMenstrual", method = RequestMethod.POST)
307 307 @ResponseBody
308 308 @TokenRequired
309   - public BaseResponse updateLastMenstrual(String lastMenstrual, String cardNo) {
310   - return patientWeightService.updateLastMenstrual(lastMenstrual, cardNo);
  309 + public BaseResponse updateLastMenstrual(String lastMenstrual, String pid) {
  310 + return patientWeightService.updateLastMenstrual(lastMenstrual, pid);
311 311 }
312 312  
313 313 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java View file @ 8326d79
... ... @@ -230,7 +230,7 @@
230 230 * @return
231 231 */
232 232 @ResponseBody
233   - @RequestMapping(value = "/cqsieves",method = RequestMethod.GET)
  233 + @RequestMapping(value = "",method = RequestMethod.GET)
234 234 @TokenRequired
235 235 public BaseResponse queryChanQianSieve(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request){
236 236 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 8326d79
... ... @@ -3941,11 +3941,11 @@
3941 3941 //1.判断是否为三个值还是七个值
3942 3942 if (StringUtils.isEmpty(item.getValueFour())) {
3943 3943 if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
3944   - && compare(item.getValueTwo(), item.getValueThree(), szy)) {
  3944 + && compare(item.getValueTwo(), item.getValueThree(), szy) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
3945 3945 list.addAll(item.getRiskIds());
3946 3946 }
3947 3947 if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
3948   - && compare(item.getValueTwo(), item.getValueThree(), ssy)) {
  3948 + && compare(item.getValueTwo(), item.getValueThree(), ssy) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
3949 3949 list.addAll(item.getRiskIds());
3950 3950 }
3951 3951 //七个值
3952 3952  
3953 3953  
3954 3954  
... ... @@ -3954,23 +3954,23 @@
3954 3954 if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
3955 3955 && compare(item.getValueTwo(), item.getValueThree(), ssy) &&
3956 3956 String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive())
3957   - && compare(item.getValueSix(), item.getValueSeven(), ssy)) {
  3957 + && compare(item.getValueSix(), item.getValueSeven(), ssy) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
3958 3958 list.addAll(item.getRiskIds());
3959 3959 } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
3960 3960 && compare(item.getValueTwo(), item.getValueThree(), ssy) &&
3961 3961 String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive())
3962   - && compare(item.getValueSix(), item.getValueSeven(), szy)) {
  3962 + && compare(item.getValueSix(), item.getValueSeven(), szy) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
3963 3963 list.addAll(item.getRiskIds());
3964 3964  
3965 3965 } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
3966 3966 && compare(item.getValueTwo(), item.getValueThree(), szy) &&
3967 3967 String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive())
3968   - && compare(item.getValueSix(), item.getValueSeven(), ssy)) {
  3968 + && compare(item.getValueSix(), item.getValueSeven(), ssy) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
3969 3969 list.addAll(item.getRiskIds());
3970 3970 } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
3971 3971 && compare(item.getValueTwo(), item.getValueThree(), szy) &&
3972 3972 String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive())
3973   - && compare(item.getValueSix(), item.getValueSeven(), szy)) {
  3973 + && compare(item.getValueSix(), item.getValueSeven(), szy) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
3974 3974 list.addAll(item.getRiskIds());
3975 3975 }
3976 3976  
3977 3977  
3978 3978  
3979 3979  
... ... @@ -3978,23 +3978,23 @@
3978 3978 if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
3979 3979 && compare(item.getValueTwo(), item.getValueThree(), ssy) ||
3980 3980 String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive())
3981   - && compare(item.getValueSix(), item.getValueSeven(), ssy)) {
  3981 + && compare(item.getValueSix(), item.getValueSeven(), ssy) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
3982 3982 list.addAll(item.getRiskIds());
3983 3983 } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
3984 3984 && compare(item.getValueTwo(), item.getValueThree(), ssy) ||
3985 3985 String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive())
3986   - && compare(item.getValueSix(), item.getValueSeven(), szy)) {
  3986 + && compare(item.getValueSix(), item.getValueSeven(), szy) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
3987 3987 list.addAll(item.getRiskIds());
3988 3988  
3989 3989 } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
3990 3990 && compare(item.getValueTwo(), item.getValueThree(), szy) ||
3991 3991 String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive())
3992   - && compare(item.getValueSix(), item.getValueSeven(), ssy)) {
  3992 + && compare(item.getValueSix(), item.getValueSeven(), ssy) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
3993 3993 list.addAll(item.getRiskIds());
3994 3994 } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
3995 3995 && compare(item.getValueTwo(), item.getValueThree(), szy) ||
3996 3996 String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive())
3997   - && compare(item.getValueSix(), item.getValueSeven(), szy)) {
  3997 + && compare(item.getValueSix(), item.getValueSeven(), szy) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
3998 3998 list.addAll(item.getRiskIds());
3999 3999 }
4000 4000 }
... ... @@ -4003,8 +4003,6 @@
4003 4003 }
4004 4004 }
4005 4005 }
4006   -
4007   -
4008 4006 if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.bc.getId())) {
4009 4007 if (StringUtils.isNotEmpty(antExcAddRequest.getbChao())) {
4010 4008 String bChao = antExcAddRequest.getbChao();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java View file @ 8326d79
... ... @@ -71,7 +71,7 @@
71 71  
72 72 String getDoctorId(List<Map<String, Object>> dayWeights2);
73 73  
74   - BaseResponse updateLastMenstrual(String lastMenstrual, String cardNo);
  74 + BaseResponse updateLastMenstrual(String lastMenstrual, String pid);
75 75  
76 76  
77 77 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 8326d79
1 1 package com.lyms.platform.operate.web.service.impl;
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.DoctorUserMapService;
6   -import com.lyms.platform.biz.service.PatientWeightService2;
7   -import com.lyms.platform.biz.service.PatientsService;
  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.*;
11 8 import com.lyms.platform.common.utils.*;
  9 +import com.lyms.platform.operate.web.controller.AntenatalExaminationController;
12 10 import com.lyms.platform.operate.web.facade.*;
13 11 import com.lyms.platform.operate.web.service.PatientWeightService;
14 12 import com.lyms.platform.operate.web.utils.CollectionUtils;
... ... @@ -94,6 +92,12 @@
94 92 private HealthChargeFacade healthChargeFacade;
95 93  
96 94  
  95 + @Autowired
  96 + private AntenatalExaminationService antenatalExaminationService;
  97 +
  98 + @Autowired
  99 + private AntExRecordService recordService;
  100 +
97 101 /**
98 102 * 最低：0~13 : 0~1.9 13~40 1.9~11.9
99 103 * 最高： 0~2.2 2.2~15.9
100 104  
101 105  
102 106  
103 107  
104 108  
105 109  
106 110  
... ... @@ -797,25 +801,48 @@
797 801 * 修改末次月经
798 802 */
799 803 @Override
800   - public BaseResponse updateLastMenstrual(String lastMenstrual, String cardNo) {
801   - if (StringUtils.isEmpty(cardNo)) {
802   - return RespBuilder.buildSuccess("查询号不能为空！");
  804 + public BaseResponse updateLastMenstrual(String lastMenstrual, String pid) {
  805 + if (StringUtils.isEmpty(pid)) {
  806 + return RespBuilder.buildSuccess(ResponseCode.PATIENT_NOT_FOUND, "查询号不能为空！");
803 807 } else if (StringUtils.isEmpty(lastMenstrual)) {
804   - return RespBuilder.buildSuccess("请填写需要纠正的末次月经！");
  808 + return RespBuilder.buildErro(ResponseCode.DATA_ERROR, "请填写需要纠正的末次月经！");
805 809 }
  810 +
  811 + Date lastMenstrualData = DateUtil.parseYMD(lastMenstrual);
806 812 //只查孕妇
807   - List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("cardNo").is(cardNo).and("type").is(1)), Patients.class);
  813 + List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("type").is(1).and("yn").is(YnEnums.YES.getId())), Patients.class);
808 814 if (CollectionUtils.isNotEmpty(patients)) {
  815 + Patients patients1 = patients.get(0);
  816 + //同时修改初诊的末次月经
809 817 Patients patient = new Patients();
810   - patient.setLastMenses(DateUtil.parseYMD(lastMenstrual));
811   -
812   - System.out.println(DateUtil.parseYMD(lastMenstrual));
  818 + patient.setLastMenses(lastMenstrualData);
813 819 for (Patients p : patients) {
814 820 patientsService.updatePatientOne(patient, p.getId());
815 821 }
  822 + AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients1.getPid())), AntExChuModel.class);
  823 + if (antExChuModel != null) {
  824 + //修改产检记录表末次月经
  825 + List<AntExRecordModel> antExRecordModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(antExChuModel.getPid())), AntExRecordModel.class);
  826 + if (CollectionUtils.isNotEmpty(antExRecordModels)) {
  827 + for (AntExRecordModel antExRecordModel : antExRecordModels) {
  828 + antExRecordModel.setLastMenses(lastMenstrualData);
  829 + recordService.updateOne(antExRecordModel, antExChuModel.getId());
  830 + }
  831 + }
  832 + antExChuModel.setLastMenses(lastMenstrualData);
  833 + antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId());
  834 + List<AntenatalExaminationModel> antenatalExaminationModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("yn").is(YnEnums.YES.getId())), AntenatalExaminationModel.class);
  835 + if (CollectionUtils.isNotEmpty(antenatalExaminationModels)) {
  836 + //循环修修改初诊的末次月经
  837 + for (AntenatalExaminationModel antenatalList : antenatalExaminationModels) {
  838 + antenatalList.setLastMenses(lastMenstrualData);
  839 + antenatalExaminationService.updateOneAnt(antenatalList, antenatalList.getId());
  840 + }
  841 + }
  842 + }
816 843 return RespBuilder.buildSuccess("成功！");
817 844 } else {
818   - return RespBuilder.buildSuccess("该孕妇已分娩或未建档！");
  845 + return RespBuilder.buildSuccess(ResponseCode.PATIENT_NOT_FOUND, "该孕妇已分娩或未建档！");
819 846 }
820 847  
821 848 }