jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 9ec0717db4ddbb0a1a6fd1e29d239f7251aa427c

Authored by jiangjiazhi
2 parents 50807e32fb b34508f366
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPersonDao.java View file @ 9ec0717
... ... @@ -15,5 +15,7 @@
15 15 public PersonModel addPerson(PersonModel model);
16 16  
17 17 public void updatePerson(PersonModel obj, String id);
  18 +
  19 + List<PersonModel> queryPersons(MongoQuery mongoQuery);
18 20 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PersonDaoImpl.java View file @ 9ec0717
... ... @@ -24,5 +24,10 @@
24 24 public void updatePerson(PersonModel obj, String id) {
25 25 update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj);
26 26 }
  27 +
  28 + @Override
  29 + public List<PersonModel> queryPersons(MongoQuery mongoQuery) {
  30 + return find(mongoQuery.convertToMongoQuery());
  31 + }
27 32 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PersonService.java View file @ 9ec0717
... ... @@ -3,10 +3,13 @@
3 3  
4 4 import com.lyms.platform.biz.dal.IPersonDao;
5 5 import com.lyms.platform.pojo.PersonModel;
  6 +import com.lyms.platform.query.PersonModelQuery;
6 7 import org.springframework.beans.factory.annotation.Autowired;
7 8 import org.springframework.stereotype.Service;
8 9  
  10 +import java.util.List;
9 11  
  12 +
10 13 @Service
11 14 public class PersonService {
12 15  
... ... @@ -22,5 +25,8 @@
22 25 }
23 26  
24 27  
  28 + public List<PersonModel> queryPersons(PersonModelQuery personModelQuery) {
  29 + return personDao.queryPersons(personModelQuery.convertToQuery());
  30 + }
25 31 }
platform-biz-service/src/main/resources/mainOrm/Users.xml View file @ 9ec0717
... ... @@ -223,6 +223,10 @@
223 223 #{item}
224 224 </foreach>
225 225 </if>
  226 + <if test="orgId != null">
  227 + and u.org_id = #{orgId,jdbcType=INTEGER}
  228 + </if>
  229 +
226 230 <if test="deptId != null">
227 231 and u.dept_id = #{deptId,jdbcType=INTEGER}
228 232 </if>
platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java View file @ 9ec0717
  1 +package com.lyms.platform.query;
  2 +
  3 +import com.lyms.platform.common.base.IConvertToNativeQuery;
  4 +import com.lyms.platform.common.dao.BaseQuery;
  5 +import com.lyms.platform.common.dao.operator.MongoCondition;
  6 +import com.lyms.platform.common.dao.operator.MongoOper;
  7 +import com.lyms.platform.common.dao.operator.MongoQuery;
  8 +import com.lyms.platform.common.utils.StringUtils;
  9 +import org.springframework.data.mongodb.core.query.Criteria;
  10 +
  11 +import java.util.Date;
  12 +
  13 +/**
  14 + * ไธชไบบๅŸบๆœฌไฟกๆฏ
  15 + *
  16 + * @author lqy
  17 + */
  18 +public class PersonModelQuery extends BaseQuery implements IConvertToNativeQuery {
  19 +
  20 + private String id;
  21 +
  22 + //ๅง“ๅ
  23 + private String name;
  24 +
  25 + //่บซไปฝ่ฏๅท
  26 + private String cardNo;
  27 +
  28 + //ๆ‰‹ๆœบ
  29 + private String phone;
  30 +
  31 + //็”Ÿๆ—ฅ
  32 + private Date birth;
  33 +
  34 + //็ฑปๅž‹ 1 ๅญ•ๅฆ‡ 2 ๅ„ฟ็ซฅ 3ๅญ•ๅฆ‡
  35 + private Integer type;
  36 +
  37 + private Date created;
  38 +
  39 + private Date modified;
  40 +
  41 + private Integer yn;
  42 +
  43 +
  44 + @Override
  45 + public MongoQuery convertToQuery() {
  46 + MongoCondition condition = MongoCondition.newInstance();
  47 +
  48 + if (null != cardNo && phone != null) {
  49 + MongoCondition con1 = MongoCondition.newInstance("cardNo", cardNo, MongoOper.IS);
  50 + MongoCondition con = MongoCondition.newInstance("phone", phone, MongoOper.IS);
  51 + condition = condition.orCondition(new MongoCondition[]{con1, con});
  52 + }
  53 + if (!StringUtils.isEmpty(id)) {
  54 + condition = condition.and("id", id, MongoOper.IS);
  55 + }
  56 +
  57 + if (!StringUtils.isEmpty(name)) {
  58 + condition = condition.and("name", name, MongoOper.IS);
  59 + }
  60 +
  61 + if (type != null) {
  62 + condition = condition.and("type", type, MongoOper.IS);
  63 + }
  64 +
  65 + return condition.toMongoQuery();
  66 + }
  67 +
  68 + public String getId() {
  69 + return id;
  70 + }
  71 +
  72 + public void setId(String id) {
  73 + this.id = id;
  74 + }
  75 +
  76 + public String getName() {
  77 + return name;
  78 + }
  79 +
  80 + public void setName(String name) {
  81 + this.name = name;
  82 + }
  83 +
  84 + public String getCardNo() {
  85 + return cardNo;
  86 + }
  87 +
  88 + public void setCardNo(String cardNo) {
  89 + this.cardNo = cardNo;
  90 + }
  91 +
  92 + public String getPhone() {
  93 + return phone;
  94 + }
  95 +
  96 + public void setPhone(String phone) {
  97 + this.phone = phone;
  98 + }
  99 +
  100 + public Date getBirth() {
  101 + return birth;
  102 + }
  103 +
  104 + public void setBirth(Date birth) {
  105 + this.birth = birth;
  106 + }
  107 +
  108 + public Integer getType() {
  109 + return type;
  110 + }
  111 +
  112 + public void setType(Integer type) {
  113 + this.type = type;
  114 + }
  115 +
  116 + public Date getCreated() {
  117 + return created;
  118 + }
  119 +
  120 + public void setCreated(Date created) {
  121 + this.created = created;
  122 + }
  123 +
  124 + public Date getModified() {
  125 + return modified;
  126 + }
  127 +
  128 + public void setModified(Date modified) {
  129 + this.modified = modified;
  130 + }
  131 +
  132 + public Integer getYn() {
  133 + return yn;
  134 + }
  135 +
  136 + public void setYn(Integer yn) {
  137 + this.yn = yn;
  138 + }
  139 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 9ec0717
... ... @@ -202,20 +202,39 @@
202 202 }
203 203  
204 204  
205   - PersonModel pmodel = new PersonModel();
206   - pmodel.setName(request.getBabyName());
207   - pmodel.setBirth(DateUtil.parseYMD(request.getBabyBirthday()));
208   - pmodel.setPhone(request.getMommyPhone());
209   - pmodel.setCardNo(request.getMommyCertificateNum());
210   - pmodel.setType(1);
211   - pmodel.setYn(YnEnums.YES.getId());
212   - pmodel.setModified(new Date());
213   - pmodel.setCreated(new Date());
214   - PersonModel resultModel = personService.addPerson(pmodel);
  205 + PersonModel resperson = null;
  206 + if (request.getMommyPhone() != null || request.getMommyCertificateNum() != null)
  207 + {
  208 + PersonModelQuery personModelQuery = new PersonModelQuery();
  209 + personModelQuery.setPhone(request.getMommyPhone());
  210 + personModelQuery.setYn(YnEnums.YES.getId());
  211 + List<PersonModel> personModels = personService.queryPersons(personModelQuery);
  212 + PersonModel pmodel = new PersonModel();
  213 + pmodel.setName(request.getBabyName());
  214 + pmodel.setBirth(DateUtil.parseYMD(request.getBabyBirthday()));
  215 + pmodel.setPhone(request.getMommyPhone());
  216 + pmodel.setCardNo(request.getMommyCertificateNum());
  217 + pmodel.setType(2);
  218 + pmodel.setYn(YnEnums.YES.getId());
  219 + pmodel.setModified(new Date());
  220 + if (CollectionUtils.isNotEmpty(personModels) && personModels.get(0) != null)
  221 + {
215 222  
  223 + resperson = personModels.get(0);
  224 + personService.updatePerson(pmodel,personModels.get(0).getId());
  225 + }
  226 + else
  227 + {
  228 + pmodel.setYn(YnEnums.YES.getId());
  229 + pmodel.setCreated(new Date());
  230 + resperson = personService.addPerson(pmodel);
  231 + }
  232 + }
216 233  
  234 +
  235 +
217 236 BabyModel model = getBabyModel(request);
218   - model.setPid(resultModel.getId());
  237 + model.setPid(resperson.getId());
219 238  
220 239 BabyModelQuery babyQuery = new BabyModelQuery();
221 240 babyQuery.setYn(YnEnums.YES.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 9ec0717
... ... @@ -97,19 +97,33 @@
97 97 return br;
98 98 }
99 99 }
  100 + PersonModel resperson = null;
  101 + if (yunRequest.getPregnantPhone() != null || yunRequest.getPregnantCertificateNum() != null)
  102 + {
  103 + PersonModelQuery personModelQuery = new PersonModelQuery();
  104 + personModelQuery.setPhone(yunRequest.getPregnantPhone());
  105 + personModelQuery.setYn(YnEnums.YES.getId());
  106 + List<PersonModel> personModels = personService.queryPersons(personModelQuery);
  107 + PersonModel pmodel = new PersonModel();
  108 + pmodel.setName(yunRequest.getPregnantName());
  109 + pmodel.setBirth(DateUtil.parseYMD(yunRequest.getBirthday()));
  110 + pmodel.setPhone(yunRequest.getPregnantPhone());
  111 + pmodel.setCardNo(yunRequest.getPregnantCertificateNum());
  112 + pmodel.setType(1);
  113 + pmodel.setModified(new Date());
  114 + if (CollectionUtils.isNotEmpty(personModels) && personModels.get(0) != null)
  115 + {
100 116  
101   -
102   -
103   - PersonModel pmodel = new PersonModel();
104   - pmodel.setName(yunRequest.getPregnantName());
105   - pmodel.setBirth(DateUtil.parseYMD(yunRequest.getBirthday()));
106   - pmodel.setPhone(yunRequest.getPregnantPhone());
107   - pmodel.setCardNo(yunRequest.getPregnantCertificateNum());
108   - pmodel.setType(1);
109   - pmodel.setYn(YnEnums.YES.getId());
110   - pmodel.setCreated(new Date());
111   - pmodel.setModified(new Date());
112   - PersonModel resperson = personService.addPerson(pmodel);
  117 + resperson = personModels.get(0);
  118 + personService.updatePerson(pmodel,personModels.get(0).getId());
  119 + }
  120 + else
  121 + {
  122 + pmodel.setYn(YnEnums.YES.getId());
  123 + pmodel.setCreated(new Date());
  124 + resperson = personService.addPerson(pmodel);
  125 + }
  126 + }
113 127  
114 128 Patients patient = getPatientsData(yunRequest);
115 129 if (resperson != null)