jiangjiazhi / regional-platform

Download as
Browse Code »

Commit fad0b31f08726845b7bc24e9cd68ac1baad929d8

Authored by liquanyu
2 parents e3708caaa2 d3a918c9c5
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 8 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ fad0b31
... ... @@ -101,7 +101,15 @@
101 101 * 小孩名称
102 102 */
103 103 private String name;
  104 + /**
  105 + * 1, "有效",0, "无效"
  106 + * 如果是孕妇分娩自动建档则无效，当完善时修改成有效
  107 + */
104 108 private Integer yn;
  109 + /**
  110 + * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0
  111 + */
  112 + private Integer dataStatus;
105 113 //预产期
106 114 private Date dueDate;
107 115 //分娩方式
... ... @@ -306,6 +314,14 @@
306 314 private boolean jxXtx;
307 315 //其他(写明病名并详细描述)
308 316 private Map<String,Object> jxOther;
  317 +
  318 + public Integer getDataStatus() {
  319 + return dataStatus;
  320 + }
  321 +
  322 + public void setDataStatus(Integer dataStatus) {
  323 + this.dataStatus = dataStatus;
  324 + }
309 325  
310 326 public List<String> getBabyHighRiskReason() {
311 327 return babyHighRiskReason;
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ fad0b31
... ... @@ -89,6 +89,11 @@
89 89  
90 90 private int yn = -1;
91 91  
  92 + /**
  93 + * 数据状态 true:排除孕妇分娩自动建档
  94 + */
  95 + private boolean dataStatus = false;
  96 +
92 97 //母亲证件号
93 98 private String mcertNo;
94 99  
... ... @@ -286,6 +291,14 @@
286 291 this.buildType = buildType;
287 292 }
288 293  
  294 + public boolean isDataStatus() {
  295 + return dataStatus;
  296 + }
  297 +
  298 + public void setDataStatus(boolean dataStatus) {
  299 + this.dataStatus = dataStatus;
  300 + }
  301 +
289 302 /**
290 303 * 是否分配社区
291 304 */
... ... @@ -604,6 +617,10 @@
604 617  
605 618 if (-1 != yn) {
606 619 condition = condition.and("yn", yn, MongoOper.IS);
  620 + }
  621 +
  622 + if (dataStatus) {//分娩自动建档
  623 + condition = condition.and("dataStatus", 1, MongoOper.NE);
607 624 }
608 625 if (null != buildType) {
609 626 condition = condition.and("buildType", buildType, MongoOper.IS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ fad0b31
... ... @@ -214,7 +214,6 @@
214 214 @RequestParam(value = "hospitalId",required = false) String hospitalId,
215 215 @RequestParam(value = "isArea",required = false) String isArea){
216 216 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
217   -
218 217 BabyManageRequest request = new BabyManageRequest();
219 218 request.setShowDetail(showDetail);
220 219 request.setBuildDoctor(buildDoctor);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ fad0b31
... ... @@ -1028,6 +1028,7 @@
1028 1028 private BabyModel getBabyModel(BabyBookbuildingAddRequest b,boolean isAdd) {
1029 1029 // hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段
1030 1030 BabyModel bm = new BabyModel();
  1031 + bm.setDataStatus(0);
1031 1032 bm.setFileCode(b.getFileCode());
1032 1033 bm.setBabyHighRiskReason(b.getBabyHighRiskReason());
1033 1034 bm.setmHighRiskReason(b.getmHighRiskReason());
... ... @@ -1269,6 +1270,8 @@
1269 1270 */
1270 1271 private BabyBuildResult getBabyBuildResult(BabyModel model) {
1271 1272 BabyBuildResult result = new BabyBuildResult();
  1273 + result.setYn(model.getYn());
  1274 + result.setDataStatus(model.getDataStatus());
1272 1275 result.setFileCode(model.getFileCode());
1273 1276 result.setmHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason()));
1274 1277 result.setBabyHighRiskReason(mongoUtil.findColor(model.getBabyHighRiskReason()));
... ... @@ -1926,8 +1929,7 @@
1926 1929  
1927 1930 public HighScoreResult queryRisk(List<String> id, boolean n) {
1928 1931 HighScoreResult highScoreResult = new HighScoreResult();
1929   - BasicConfigQuery
1930   - basicConfigQuery = new BasicConfigQuery();
  1932 + BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
1931 1933 List data = new ArrayList();
1932 1934 List dat1a = new ArrayList();
1933 1935 Integer score = null;
... ... @@ -2031,6 +2033,7 @@
2031 2033  
2032 2034 BabyModelQuery babyQuery = new BabyModelQuery();
2033 2035 babyQuery.setQueryNo(request.getQueryNo());
  2036 + babyQuery.setDataStatus(true);//排除自动建档数据
2034 2037 //体弱儿详情
2035 2038 babyQuery.setWeakSonInfo(request.getWeakSonInfo());
2036 2039 //高危儿详情
... ... @@ -2272,7 +2275,7 @@
2272 2275 babyQuery.setLimit(request.getLimit());
2273 2276  
2274 2277 //0 非高危 1 高危 2 全部 3、体弱儿
2275   - if (request.getHighRiskType() != null && request.getHighRiskType() ==1) {
  2278 + if (request.getHighRiskType() != null) {
2276 2279 if (request.getHighRiskType() ==1) {
2277 2280 babyQuery.setLastHighRisk(1);
2278 2281 }else if (request.getHighRiskType() ==3) {
... ... @@ -2453,6 +2456,8 @@
2453 2456 BabyModel babyModel = models.get(0);
2454 2457  
2455 2458 result = new BabyBuildResult();
  2459 + result.setYn(babyModel.getYn());
  2460 + result.setDataStatus(babyModel.getDataStatus());
2456 2461 result.setMommyName(babyModel.getMname());
2457 2462 result.setMommyCertificateTypeId(babyModel.getMcertTypeId());
2458 2463 result.setMommyCertificateNum(babyModel.getMcertNo());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ fad0b31
... ... @@ -767,6 +767,8 @@
767 767 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
768 768 if (models != null && models.size() > 0) {
769 769 model = models.get(0);
  770 + base.setYn(model.getYn());
  771 + base.setDataStatus(model.getDataStatus());
770 772 base.setmHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason()));
771 773 base.setBabyLastHighRisk(getBabyLastHighRisk(model.getPid()));
772 774 base.setId(id);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java View file @ fad0b31
... ... @@ -127,8 +127,15 @@
127 127 private String homeCityId;
128 128 private String homeAreaId;
129 129 private String homeStreetId;
130   -
131   -
  130 + /**
  131 + * 1, "有效",0, "无效"
  132 + * 如果是孕妇分娩自动建档则无效，当完善时修改成有效
  133 + */
  134 + private Integer yn;
  135 + /**
  136 + * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0
  137 + */
  138 + private Integer dataStatus;
132 139 /***********儿童出生信息***********/
133 140  
134 141 //分娩日期
... ... @@ -304,6 +311,21 @@
304 311 //档案编号 滦平需求
305 312 private String fileCode;
306 313  
  314 + public Integer getYn() {
  315 + return yn;
  316 + }
  317 +
  318 + public void setYn(Integer yn) {
  319 + this.yn = yn;
  320 + }
  321 +
  322 + public Integer getDataStatus() {
  323 + return dataStatus;
  324 + }
  325 +
  326 + public void setDataStatus(Integer dataStatus) {
  327 + this.dataStatus = dataStatus;
  328 + }
307 329  
308 330 public boolean isJxWn() {
309 331 return jxWn;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java View file @ fad0b31
... ... @@ -53,6 +53,31 @@
53 53 private Integer dueWeek;
54 54 //预产期
55 55 private String dueDate;
  56 + /**
  57 + * 1, "有效",0, "无效"
  58 + * 如果是孕妇分娩自动建档则无效，当完善时修改成有效
  59 + */
  60 + private Integer yn;
  61 + /**
  62 + * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0
  63 + */
  64 + private Integer dataStatus;
  65 +
  66 + public Integer getYn() {
  67 + return yn;
  68 + }
  69 +
  70 + public void setYn(Integer yn) {
  71 + this.yn = yn;
  72 + }
  73 +
  74 + public Integer getDataStatus() {
  75 + return dataStatus;
  76 + }
  77 +
  78 + public void setDataStatus(Integer dataStatus) {
  79 + this.dataStatus = dataStatus;
  80 + }
56 81  
57 82 public String getDueDate() {
58 83 return dueDate;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ fad0b31
... ... @@ -85,6 +85,15 @@
85 85 private String homeCityId;
86 86 private String homeAreaId;
87 87 private String homeStreetId;
  88 + /**
  89 + * 1, "有效",0, "无效"
  90 + * 如果是孕妇分娩自动建档则无效，当完善时修改成有效
  91 + */
  92 + private Integer yn;
  93 + /**
  94 + * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0
  95 + */
  96 + private Integer dataStatus;
88 97  
89 98  
90 99 /***********儿童出生信息***********/
... ... @@ -254,6 +263,22 @@
254 263  
255 264 //显示服务信息
256 265 private List<PatientSerResult> patientSerResults;
  266 +
  267 + public Integer getYn() {
  268 + return yn;
  269 + }
  270 +
  271 + public void setYn(Integer yn) {
  272 + this.yn = yn;
  273 + }
  274 +
  275 + public Integer getDataStatus() {
  276 + return dataStatus;
  277 + }
  278 +
  279 + public void setDataStatus(Integer dataStatus) {
  280 + this.dataStatus = dataStatus;
  281 + }
257 282  
258 283 public List getHighRiskInfo() {
259 284 return highRiskInfo;