fangcheng / regional-platform

Download as
Browse Code »

Commit 23a86f006b11d2acfe8ae344cd2732e55c5e814e

Authored by baohanddd
2 parents 45f6c18053 d2e36c3e83
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 8 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java View file @ 23a86f0
... ... @@ -13,6 +13,7 @@
13 13 import org.springframework.stereotype.Repository;
14 14 import org.springframework.util.Assert;
15 15  
  16 +import java.util.Date;
16 17 import java.util.List;
17 18  
18 19 /**
... ... @@ -22,6 +23,7 @@
22 23 public class SieveDaoImpl extends BaseMongoDAOImpl<SieveResultModel> implements ISieveDao {
23 24 @Override
24 25 public SieveResultModel addSieveResult(SieveResultModel sieveResultModel) {
  26 + sieveResultModel.setModified(new Date());
25 27 return save(sieveResultModel);
26 28 }
27 29  
... ... @@ -43,6 +45,7 @@
43 45 }
44 46  
45 47 public void updateChanQianSieve(SieveModel sieveModel) {
  48 + sieveModel.setModified(new Date());
46 49 Update update = MongoConvertHelper
47 50 .convertToNativeUpdate(ReflectionUtils.getUpdateField(sieveModel));
48 51 Assert.notNull(update, "execute update method must not null.");
49 52  
... ... @@ -50,7 +53,10 @@
50 53 }
51 54  
52 55 public void addChanQianSieve(SieveModel sieveModel) {
  56 +
53 57 Assert.notNull(sieveModel, "execute insert method must not null.");
  58 + sieveModel.setCreated(new Date());
  59 + sieveModel.setModified(new Date());
54 60 mongoTemplate.insert(sieveModel);
55 61 }
56 62  
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ 23a86f0
... ... @@ -5,6 +5,7 @@
5 5 import com.lyms.platform.biz.dal.ISieveApplyOrderDao;
6 6 import com.lyms.platform.biz.dal.ISieveDao;
7 7 import com.lyms.platform.common.dao.operator.MongoQuery;
  8 +import com.lyms.platform.common.enums.SieveStatusEnums;
8 9 import com.lyms.platform.common.enums.YnEnums;
9 10 import com.lyms.platform.common.utils.DateUtil;
10 11 import com.lyms.platform.common.utils.LogUtil;
11 12  
... ... @@ -161,7 +162,10 @@
161 162 if (CollectionUtils.isNotEmpty(list)) {
162 163 sieveModel.setTireNumber(NumberUtils.toInt(list.get(0).getTireNumber()));
163 164 }
  165 + sieveModel.setName(patients.getUsername());
164 166 sieveModel.setPhone(patients.getPhone());
  167 + sieveModel.setStatus(SieveStatusEnums.O.getId());
  168 + sieveModel.setCqStatus(0);
165 169 return sieveModel;
166 170 }
167 171  
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java View file @ 23a86f0
... ... @@ -35,6 +35,7 @@
35 35  
36 36 public void updateOneChanQianDiaSieve(SieveModel sieveModel) {
37 37 sieveModel.setModified(new Date());
  38 + sieveModel.setStatus(1);
38 39 iSieveDao.updateChanQianSieve(sieveModel);
39 40 }
40 41  
platform-common/src/main/java/com/lyms/platform/common/enums/SieveStatusEnums.java View file @ 23a86f0
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +/**
  4 + *
  5 + * 产筛状态
  6 + *
  7 + * Created by Administrator on 2016/7/6 0006.
  8 + */
  9 +public enum SieveStatusEnums {
  10 +// 1 待产筛 2 产筛中 3 完成产筛 4 完成产诊
  11 + O("待产筛",1),
  12 + O1("产筛中",2),
  13 + O2("完成产筛",3),
  14 + O3("完成产诊",4),
  15 + ;
  16 + private SieveStatusEnums(String name,Integer id){
  17 + this.name=name;
  18 + this.id=id;
  19 + }
  20 + private String name;
  21 + private Integer id;
  22 +
  23 + public Integer getId() {
  24 + return id;
  25 + }
  26 +
  27 + public void setId(Integer id) {
  28 + this.id = id;
  29 + }
  30 +
  31 + public String getName() {
  32 + return name;
  33 + }
  34 +
  35 + public void setName(String name) {
  36 + this.name = name;
  37 + }
  38 +}
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 23a86f0
... ... @@ -322,6 +322,9 @@
322 322 if (null != highRisk) {
323 323 condition = condition.and("highRisk", highRisk, MongoOper.IS);
324 324 }
  325 + if (null != expVip) {
  326 + condition = condition.and("expVip", expVip, MongoOper.IS);
  327 + }
325 328  
326 329  
327 330 Criteria c = null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 23a86f0
... ... @@ -730,7 +730,7 @@
730 730 // babyQuery.setBirthStart(DateUtil.parseYMD(request.getBirthStart()));
731 731 // babyQuery.setBirthEnd(DateUtil.parseYMD(request.getBirthEnd()));
732 732  
733   - if (request.getServiceType() != null && request.getServiceType() != 0)
  733 + if (request.getServiceType() != null && request.getServiceType() != 100)
734 734 {
735 735 babyQuery.setServiceType(request.getServiceType());
736 736 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ 23a86f0
... ... @@ -110,7 +110,7 @@
110 110 // 其他高危
111 111 private Map otherHighRisk;
112 112 // 诊断
113   - private String diagnosis;
  113 + private List diagnosis;
114 114 //处理意见
115 115 private String treatOpinion;
116 116 //指导意见
117 117  
118 118  
... ... @@ -561,14 +561,70 @@
561 561 }
562 562  
563 563  
564   - public String getDiagnosis() {
  564 + public String getCervical() {
  565 + return cervical;
  566 + }
  567 +
  568 + public void setCervical(String cervical) {
  569 + this.cervical = cervical;
  570 + }
  571 +
  572 + public List getDiagnosis() {
565 573 return diagnosis;
566 574 }
567 575  
568   - public void setDiagnosis(String diagnosis) {
  576 + public void setDiagnosis(List diagnosis) {
569 577 this.diagnosis = diagnosis;
570 578 }
571 579  
  580 + public String getFujian() {
  581 + return fujian;
  582 + }
  583 +
  584 + public void setFujian(String fujian) {
  585 + this.fujian = fujian;
  586 + }
  587 +
  588 + public String getHeart() {
  589 + return heart;
  590 + }
  591 +
  592 + public void setHeart(String heart) {
  593 + this.heart = heart;
  594 + }
  595 +
  596 + public String getLungs() {
  597 + return lungs;
  598 + }
  599 +
  600 + public void setLungs(String lungs) {
  601 + this.lungs = lungs;
  602 + }
  603 +
  604 + public String getUterus() {
  605 + return uterus;
  606 + }
  607 +
  608 + public void setUterus(String uterus) {
  609 + this.uterus = uterus;
  610 + }
  611 +
  612 + public String getVagina() {
  613 + return vagina;
  614 + }
  615 +
  616 + public void setVagina(String vagina) {
  617 + this.vagina = vagina;
  618 + }
  619 +
  620 + public String getVulva() {
  621 + return vulva;
  622 + }
  623 +
  624 + public void setVulva(String vulva) {
  625 + this.vulva = vulva;
  626 + }
  627 +
572 628 public String getDirOpinion() {
573 629 return dirOpinion;
574 630 }
... ... @@ -813,7 +869,7 @@
813 869 antExChuModel.setHighrisk(JsonUtil.array2JsonString(highrisk));
814 870 antExChuModel.setHighriskSocre(highriskSocre);
815 871 antExChuModel.setOtherHighRisk(JsonUtil.obj2JsonString(otherHighRisk));
816   - antExChuModel.setDiagnosis(diagnosis);
  872 + antExChuModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis));
817 873 antExChuModel.setTreatOpinion(treatOpinion);
818 874 antExChuModel.setDirOpinion(dirOpinion);
819 875 antExChuModel.setProdDoctor(prodDoctor);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java View file @ 23a86f0
... ... @@ -133,17 +133,29 @@
133 133 setId(destModel.getId());
134 134 setParentId(destModel.getParentId());
135 135 setName(destModel.getName());
136   - int days= DateUtil.daysBetween(destModel.getLastMenses(), new Date());
137   - String week= (days/7)+"";
138   - int day = (days%7);
139   - this.cDueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
140   - setTireNumber(TaiPanEnums.getTitle(destModel.getTireNumber() + ""));
  136 + if(null!=destModel.getLastMenses()){
  137 + int days= DateUtil.daysBetween(destModel.getLastMenses(), new Date());
  138 + String week= (days/7)+"";
  139 + int day = (days%7);
  140 + this.cDueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
  141 + }
  142 + if(null!=destModel.getTireNumber()){
  143 + setTireNumber(TaiPanEnums.getTitle(destModel.getTireNumber() + ""));
  144 + }
141 145 setDueWeek(destModel.getDueWeek());
142   - setZtfx(SieveEnums.getTitle(destModel.getZtfx()));
  146 + if(null!=destModel.getZtfx()) {
  147 + setZtfx(SieveEnums.getTitle(destModel.getZtfx()));
  148 + }
143 149 setPhone(destModel.getPhone());
144   - setCqStatus(ChanQResultEnums.getTitle(destModel.getCqStatus()));
145   - setCqResult(ChanQResultEnums.CqResult.getTitle(destModel.getCqResult()));
146   - setRenShenResult(RenShenJieJuEnums.getTitle(destModel.getRenShenResult()));
  150 + if(null!=destModel.getCqStatus()) {
  151 + setCqStatus(ChanQResultEnums.getTitle(destModel.getCqStatus()));
  152 + }
  153 + if(null!=destModel.getCqResult()) {
  154 + setCqResult(ChanQResultEnums.CqResult.getTitle(destModel.getCqResult()));
  155 + }
  156 + if(null!=destModel.getRenShenResult()) {
  157 + setRenShenResult(RenShenJieJuEnums.getTitle(destModel.getRenShenResult()));
  158 + }
147 159 //整体风险枚举
148 160 // SieveEnums.
149 161 //妊娠结局