jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4bf8dd6bf7cfb079c47f396df69007596750e0db

Authored by baohanddd
2 parents a53069862c e11fbdcd10
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 11 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java View file @ 4bf8dd6
... ... @@ -21,7 +21,7 @@
21 21 //分娩孕周
22 22 private String dueWeek;
23 23 //台数
24   - private int tireNumber;
  24 + private Integer tireNumber;
25 25 //胎盘
26 26 private String placenta;
27 27 /*//心率
... ... @@ -45,7 +45,7 @@
45 45 //会阴情况
46 46 private String perinealCondition;
47 47 //撕裂等级
48   - private int siLielevel;
  48 + private Integer siLielevel;
49 49 //锋线针数
50 50 private Integer needleNum;
51 51 //产妇情况
52 52  
... ... @@ -396,11 +396,11 @@
396 396 this.sHloseBloodL = sHloseBloodL;
397 397 }
398 398  
399   - public int getSiLielevel() {
  399 + public Integer getSiLielevel() {
400 400 return siLielevel;
401 401 }
402 402  
403   - public void setSiLielevel(int siLielevel) {
  403 + public void setSiLielevel(Integer siLielevel) {
404 404 this.siLielevel = siLielevel;
405 405 }
406 406  
407 407  
... ... @@ -412,11 +412,11 @@
412 412 this.tHloseBloodL = tHloseBloodL;
413 413 }
414 414  
415   - public int getTireNumber() {
  415 + public Integer getTireNumber() {
416 416 return tireNumber;
417 417 }
418 418  
419   - public void setTireNumber(int tireNumber) {
  419 + public void setTireNumber(Integer tireNumber) {
420 420 this.tireNumber = tireNumber;
421 421 }
422 422  
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ 4bf8dd6
... ... @@ -21,7 +21,6 @@
21 21 /**
22 22 * 身份证号码
23 23 */
24   - @Field("cardno")
25 24 private String cardNo;
26 25 /**
27 26 * 助产机构
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 4bf8dd6
... ... @@ -391,7 +391,7 @@
391 391 condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS);
392 392 }
393 393 if (null != cardNo) {
394   - condition = condition.and("cardno", cardNo, MongoOper.IS);
  394 + condition = condition.and("cardNo", cardNo, MongoOper.IS);
395 395  
396 396 }
397 397 if (null != phone) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java View file @ 4bf8dd6
... ... @@ -78,10 +78,12 @@
78 78 PermissionTypeEnums permissionTypeEnums = PermissionTypeEnums.getEnumsById(roles.getPermissiontype());
79 79  
80 80 Assert.notNull(permissionTypeEnums, "权限类型不存在.");
81   -
  81 + if(CollectionUtils.isNotEmpty(accessPermissionAddRequest.getDeptId())){
  82 + permission.setDeptid(accessPermissionAddRequest.getDeptId());
  83 + }
82 84 permission.setType(permissionTypeEnums.getId());
83 85 dataPermissionsModel.getData().clear();
84   - dataPermissionsModel.addOnePer( roles.getHospitalid(), permission);
  86 + dataPermissionsModel.addOnePer(roles.getHospitalid(), permission);
85 87 }else if(PermissionTypeEnums.Type.ADMIN.getId()==NumberUtils.toInt(accessPermissionAddRequest.getType())){
86 88 //如果是院外的权限,就只需要设置医院的id
87 89 permission.setType(PermissionTypeEnums.ALL_HOSPITAL.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 4bf8dd6
... ... @@ -326,6 +326,13 @@
326 326 antenatalExaminationResult.setDiagnosis(queryRisk(list));
327 327 } catch (Exception e) {
328 328 }
  329 + ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
  330 + referralApplyOrderQuery.setParentId(examinationModel.getParentId());
  331 + antenatalExaminationResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
  332 + SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery();
  333 + applyOrderQuery.setParentId(examinationModel.getParentId());
  334 + applyOrderQuery.setYn(YnEnums.YES.getId());
  335 + antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1);
329 336 object = antenatalExaminationResult;
330 337 } else {
331 338 //查询初诊数据
332 339  
... ... @@ -348,8 +355,14 @@
348 355 List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
349 356 antexChuResult.setHighrisk(queryRisk(list1));
350 357 } catch (Exception e) {
351   -
352 358 }
  359 + ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
  360 + referralApplyOrderQuery.setParentId(antExChuModel.getParentId());
  361 + antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
  362 + SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery();
  363 + applyOrderQuery.setParentId(antExChuModel.getParentId());
  364 + applyOrderQuery.setYn(YnEnums.YES.getId());
  365 + antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1);
353 366 object = antexChuResult;
354 367 }
355 368  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 4bf8dd6
... ... @@ -773,7 +773,7 @@
773 773 result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth()));
774 774 result.setMommyName(model.getMname());
775 775 result.setMommnyPhone(model.getMphone());
776   - result.setServiceStatus(ServiceStatusEnums.getNameById(model.getServiceStatus()));
  776 + result.setServiceStatus(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus()));
777 777 result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
778 778 result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
779 779 result.setPatientId(model.getParentId());
... ... @@ -784,6 +784,7 @@
784 784 List diagList = JsonUtil.toList(model.getDiagnose(),List.class);
785 785 if (CollectionUtils.isNotEmpty(diagList))
786 786 {
  787 + diagnose = "";
787 788 for(Object obj : diagList)
788 789 {
789 790 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String)obj);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AccessPermissionAddRequest.java View file @ 4bf8dd6
... ... @@ -7,6 +7,7 @@
7 7 import org.hibernate.validator.constraints.NotEmpty;
8 8  
9 9 import javax.validation.constraints.Pattern;
  10 +import java.util.List;
10 11  
11 12 /**
12 13 * Created by Administrator on 2016/3/29 0029.
13 14  
... ... @@ -24,7 +25,16 @@
24 25 //用户id/角色id
25 26 @FormParam("userid")
26 27 private String userId;
  28 + @FormParam
  29 + private List deptId;
27 30  
  31 + public List getDeptId() {
  32 + return deptId;
  33 + }
  34 +
  35 + public void setDeptId(List deptId) {
  36 + this.deptId = deptId;
  37 + }
28 38  
29 39 public String getBizId() {
30 40 return bizId;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java View file @ 4bf8dd6
... ... @@ -451,13 +451,18 @@
451 451 babyModel.setYn(YnEnums.YES.getId());
452 452 babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId());
453 453 babyModel.setAsphyxiaM(asphyxiaM);
454   - babyModel.setSex(Integer.valueOf(babyGender));
  454 + if(null!=babyGender){
  455 + babyModel.setSex(Integer.valueOf(babyGender));
  456 + }
  457 + if(null!=apgarScore){
  458 + babyModel.setApgarScore(JsonUtil.obj2JsonString(apgarScore));
  459 + }
455 460 babyModel.setModified(new Date());
456 461 babyModel.setBabyHealthy(babyHealthy);
457 462 babyModel.setBabyWeight(babyWeight);
458 463 babyModel.setBabyHeight(babyHeight);
459 464 babyModel.setMalformation(deformity);
460   - babyModel.setApgarScore(JsonUtil.obj2JsonString(apgarScore));
  465 +
461 466 babyModel.setPregnancyOut(pregnancyOut);
462 467 babyModel.setContactM(contactM);
463 468 babyModel.setContactStartM(contactStartM);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 4bf8dd6
... ... @@ -69,6 +69,26 @@
69 69 private String checkDate;
70 70 //下次产检日期
71 71 private Map nextCheckTime;
  72 + //是否有转诊
  73 + private int hasRefer;
  74 + //是否有产筛
  75 + private int hasSieve;
  76 +
  77 + public int getHasRefer() {
  78 + return hasRefer;
  79 + }
  80 +
  81 + public void setHasRefer(int hasRefer) {
  82 + this.hasRefer = hasRefer;
  83 + }
  84 +
  85 + public int getHasSieve() {
  86 + return hasSieve;
  87 + }
  88 +
  89 + public void setHasSieve(int hasSieve) {
  90 + this.hasSieve = hasSieve;
  91 + }
72 92  
73 93 public Map getNextCheckTime() {
74 94 return nextCheckTime;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 4bf8dd6
... ... @@ -199,6 +199,26 @@
199 199 private String ydqjd;
200 200 //实验结果
201 201 private String syjg;
  202 + //是否有转诊
  203 + private int hasRefer;
  204 + //是否有产筛
  205 + private int hasSieve;
  206 +
  207 + public int getHasRefer() {
  208 + return hasRefer;
  209 + }
  210 +
  211 + public void setHasRefer(int hasRefer) {
  212 + this.hasRefer = hasRefer;
  213 + }
  214 +
  215 + public int getHasSieve() {
  216 + return hasSieve;
  217 + }
  218 +
  219 + public void setHasSieve(int hasSieve) {
  220 + this.hasSieve = hasSieve;
  221 + }
202 222  
203 223 public String getSyjg() {
204 224 return syjg;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java View file @ 4bf8dd6
... ... @@ -39,10 +39,20 @@
39 39 private String applyDoctor;
40 40 //接收日期
41 41 private String received;
  42 + private String cardNo;
  43 +
42 44 //创建时间
43 45 private String created;
44 46 private String status;
45 47  
  48 + public String getCardNo() {
  49 + return cardNo;
  50 + }
  51 +
  52 + public void setCardNo(String cardNo) {
  53 + this.cardNo = cardNo;
  54 + }
  55 +
46 56 public Integer getAge() {
47 57 return age;
48 58 }
... ... @@ -197,6 +207,7 @@
197 207 setStatus(ApplyOrderStatusEnums.getTitle(destModel.getStatus()));
198 208 setTransferredHospital(destModel.getTransferredHospital());
199 209 setAge(destModel.getAge());
  210 + setCardNo(destModel.getCardNo());
200 211 return this;
201 212 }
202 213 }