jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4341740331d680a31343fc5878866e89baf49ab1

Authored by hujiaqi
2 parents 582fe279e6 66aa180682
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/PatientCheckTicketDao.java View file @ 4341740
... ... @@ -20,5 +20,7 @@
20 20  
21 21 public List<PatientCheckTicket> queryTicket(MongoQuery query);
22 22  
  23 + void findAndModify(MongoQuery query,PatientCheckTicket ticket);
  24 +
23 25 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientCheckTicketDaoImpl.java View file @ 4341740
... ... @@ -39,5 +39,9 @@
39 39 public List<PatientCheckTicket> queryTicket(MongoQuery query) {
40 40 return find(query.convertToMongoQuery());
41 41 }
  42 +
  43 + public void findAndModify(MongoQuery query,PatientCheckTicket ticket){
  44 + updateMulti(query.convertToMongoQuery(), ticket);
  45 + }
42 46 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCheckTicketService.java View file @ 4341740
... ... @@ -29,6 +29,10 @@
29 29 patientCheckTicketDao.updateTicket(obj);;
30 30 }
31 31  
  32 +
  33 +
  34 +
  35 +
32 36 public String updateTicket(String id, Integer status, String cousumeHospitalId) {
33 37 PatientCheckTicket ticket = getTicket(id);
34 38 if (ticket == null) {
... ... @@ -43,6 +47,10 @@
43 47 ticket.setConsumeDate(new Date());
44 48 updateTicket(ticket);
45 49 return null;
  50 + }
  51 +
  52 + public void findAndModify(PatientCheckTicketQuery query,PatientCheckTicket ticket){
  53 + patientCheckTicketDao.findAndModify(query.convertToQuery(),ticket);
46 54 }
47 55  
48 56 public PatientCheckTicket getTicket(String id) {
platform-dal/src/main/java/com/lyms/platform/query/PatientCheckTicketQuery.java View file @ 4341740
... ... @@ -8,6 +8,8 @@
8 8 import com.lyms.platform.common.utils.StringUtils;
9 9 import org.springframework.data.mongodb.core.query.Criteria;
10 10  
  11 +import java.util.Date;
  12 +
11 13 /**
12 14 * Created by riecard on 2016/12/28.
13 15 */
14 16  
... ... @@ -28,7 +30,25 @@
28 30 private String hospitalId;
29 31 private String consumeHospitalId;
30 32 private Integer status; // 1：创建未使用， 2：产检使用，3：分娩销毁
  33 + private Date createdStart;
  34 + private Date createdEnd;
31 35  
  36 + public Date getCreatedStart() {
  37 + return createdStart;
  38 + }
  39 +
  40 + public void setCreatedStart(Date createdStart) {
  41 + this.createdStart = createdStart;
  42 + }
  43 +
  44 + public Date getCreatedEnd() {
  45 + return createdEnd;
  46 + }
  47 +
  48 + public void setCreatedEnd(Date createdEnd) {
  49 + this.createdEnd = createdEnd;
  50 + }
  51 +
32 52 @Override
33 53 public MongoQuery convertToQuery() {
34 54 MongoCondition condition = MongoCondition.newInstance();
... ... @@ -49,6 +69,25 @@
49 69 }
50 70 if (!StringUtils.isEmpty(consumeHospitalId)) {
51 71 condition = condition.and("consumeHospitalId", consumeHospitalId, MongoOper.IS);
  72 + }
  73 + Criteria c1=null;
  74 + if (null != createdStart) {
  75 + if (null != c1) {
  76 + c1 = c1.and("created").gte(createdStart);
  77 + } else {
  78 + c1 = Criteria.where("created").gte(createdStart);
  79 + }
  80 + }
  81 +
  82 + if (null != createdEnd) {
  83 + if (null != c1) {
  84 + c1 = c1.lte(createdEnd);
  85 + } else {
  86 + c1 = Criteria.where("created").lte(createdEnd);
  87 + }
  88 + }
  89 + if (null != c1) {
  90 + condition = condition.andCondition(new MongoCondition(c1));
52 91 }
53 92 return condition.toMongoQuery();
54 93 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 4341740
... ... @@ -40,6 +40,8 @@
40 40 public class MatDeliverFacade {
41 41  
42 42 private Logger logger = LoggerFactory.getLogger(MatDeliverFacade.class);
  43 + @Autowired
  44 + private PatientCheckTicketService patientCheckTicketService;
43 45  
44 46 @Autowired
45 47 private MatDeliverService matDeliverService;
... ... @@ -194,6 +196,10 @@
194 196 patientsLocal.setIsAutoFm(YnEnums.NO.getId());
195 197 patientsLocal.setType(3);
196 198 patientsLocal.setFmHospital(deliverAddRequest.getFmHospital());
  199 + //自动分娩的时候修改buildtype为0 http://jira.healthbaby.com.cn/browse/WEB-808
  200 + if (null != patients1.getBuildType() && patients1.getBuildType() == 2) {
  201 + patientsLocal.setBuildType(0);
  202 + }
197 203 patientsLocal.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode()) ? null : deliverAddRequest.getDeliveryMode().toString());
198 204 try {
199 205 patientsLocal.setFmAge(DateUtil.getAge(patients1.getBirth(), fmDate));
... ... @@ -252,6 +258,19 @@
252 258  
253 259 maternalDeliverModel.setYn(YnEnums.YES.getId());
254 260 matDeliverService.addMatDeliver(maternalDeliverModel);
  261 +
  262 +
  263 + //作废产检劵
  264 + PatientCheckTicketQuery patientCheckTicketQuery=new PatientCheckTicketQuery();
  265 + Patients pa=patientsService.findOnePatientById(deliverAddRequest.getParentId());
  266 + patientCheckTicketQuery.setStatus(1);
  267 + patientCheckTicketQuery.setCreatedStart(pa.getLastMenses());
  268 + patientCheckTicketQuery.setCreatedEnd(pa.getFmDate());
  269 + patientCheckTicketQuery.setPid(pa.getPid());
  270 + PatientCheckTicket patientCheckTicket=new PatientCheckTicket();
  271 + patientCheckTicket.setStatus(3);
  272 + patientCheckTicket.setConsumeHospitalId(hospitalId);
  273 + patientCheckTicketService.findAndModify(patientCheckTicketQuery,patientCheckTicket);
255 274 //修改
256 275 } else if (StringUtils.isNotEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) {
257 276  
... ... @@ -344,6 +363,10 @@
344 363 patients1.setFmDate(fmDate);
345 364 // HuJiaqi添加开始，这里冗余了分娩分娩医院，分娩年龄，分娩孕周，分娩方式，并将状态更改为产妇
346 365 patients1.setType(3);
  366 + //自动分娩的时候修改buildtype为0 http://jira.healthbaby.com.cn/browse/WEB-808
  367 + if (null != patients.getBuildType() && patients.getBuildType() == 2) {
  368 + patients1.setBuildType(0);
  369 + }
347 370 patients1.setIsAutoFm(YnEnums.NO.getId());
348 371 patients1.setFmHospital(deliverAddRequest.getFmHospital());
349 372 patients1.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode()) ? null : deliverAddRequest.getDeliveryMode().toString());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java View file @ 4341740
... ... @@ -55,6 +55,8 @@
55 55 private MatDeliverService matDeliverService;
56 56 @Autowired
57 57 private OrganizationGroupsFacade groupsFacade;
  58 + @Autowired
  59 + private PatientCheckTicketService patientCheckTicketService;
58 60  
59 61 /**
60 62 * 更新终止妊娠
... ... @@ -207,6 +209,20 @@
207 209 model.setModified(new Date());
208 210  
209 211 stopPregnancyService.addStopPreg(model);
  212 +
  213 + //作废产检劵
  214 + PatientCheckTicketQuery patientCheckTicketQuery=new PatientCheckTicketQuery();
  215 + Patients pa=patientsService.findOnePatientById(pat.getId());
  216 + patientCheckTicketQuery.setStatus(1);
  217 + patientCheckTicketQuery.setCreatedStart(pa.getLastMenses());
  218 + patientCheckTicketQuery.setCreatedEnd(pa.getFmDate());
  219 + patientCheckTicketQuery.setPid(pa.getPid());
  220 +
  221 + PatientCheckTicket patientCheckTicket=new PatientCheckTicket();
  222 + patientCheckTicket.setStatus(3);
  223 + patientCheckTicket.setConsumeHospitalId(autoMatchFacade.getHospitalId(userId));
  224 + patientCheckTicketService.findAndModify(patientCheckTicketQuery,patientCheckTicket);
  225 +
210 226 BaseResponse objectResponse = new BaseResponse();
211 227 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
212 228 objectResponse.setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java View file @ 4341740
... ... @@ -133,7 +133,7 @@
133 133 status="1";
134 134 }
135 135  
136   - if (patients.getDueStatus() == 1) {
  136 + if (null!=patients.getDueStatus()&&patients.getDueStatus() == 1) {
137 137 this.dueWeek = "终止妊娠";
138 138 } else if (null != patients.getFmDate()&&patients.getType()==3) {
139 139 dueWeek = "已分娩";