From 96533fef0783d4b6c073653f458410df9b01d5c4 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 4 May 2018 16:34:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=99=8C=E7=AD=9B=E6=9F=A5=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/pojo/CancerScreeningModel.java | 74 +++++++-------- .../lyms/platform/query/CancerScreeningQuery.java | 55 ++++++----- .../operate/web/facade/CancerScreeningFacade.java | 102 +++++++++++++++------ .../web/facade/PremaritalCheckupFacade.java | 2 + .../operate/web/facade/ResidentsFacade.java | 2 + .../web/request/CancerScreeningRequest.java | 4 +- 6 files changed, 147 insertions(+), 92 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java index 1f18ec4..554887d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java @@ -42,7 +42,7 @@ public class CancerScreeningModel extends BaseModel { private String areaId; //街道 private String streetId; - //详细 + //详细地址 private String address; //个案编号 private String number; @@ -144,7 +144,7 @@ public class CancerScreeningModel extends BaseModel { //检査人员 private String rxlJcry; //检査日期 - private String rxlJcrq; + private Date rxlJcrq; //(四〉乳腺X线检査（未作X线检査不填写此项） //乳腺X线评估左 private String rxPgz; @@ -162,7 +162,7 @@ public class CancerScreeningModel extends BaseModel { //病理诊断者 private String sfBlzd; //病理检査日期 - private String sfJcrq; + private Date sfJcrq; //最后诊断 private String sfZhzd; //TNM分期 @@ -170,7 +170,7 @@ public class CancerScreeningModel extends BaseModel { //诊治机构 private String sfZzjg; //诊治日期 - private String sfZlrq; + private Date sfZlrq; //接受治疗情况 private String sfJszl; //检査机构 @@ -178,7 +178,8 @@ public class CancerScreeningModel extends BaseModel { //检查人员 private String sfJcry; //检査日期 - private String sfJcsj; + private Date sfJcsj; + private Date modified; private Date created; //操作人 @@ -188,6 +189,30 @@ public class CancerScreeningModel extends BaseModel { */ private Integer yn; + public Date getRxlJcrq() { + return rxlJcrq; + } + + public void setRxlJcrq(Date rxlJcrq) { + this.rxlJcrq = rxlJcrq; + } + + public Date getSfJcrq() { + return sfJcrq; + } + + public void setSfJcrq(Date sfJcrq) { + this.sfJcrq = sfJcrq; + } + + public Date getSfZlrq() { + return sfZlrq; + } + + public void setSfZlrq(Date sfZlrq) { + this.sfZlrq = sfZlrq; + } + public String getHospitalId() { return hospitalId; } @@ -676,14 +701,6 @@ public class CancerScreeningModel extends BaseModel { this.rxlJcry = rxlJcry; } - public String getRxlJcrq() { - return rxlJcrq; - } - - public void setRxlJcrq(String rxlJcrq) { - this.rxlJcrq = rxlJcrq; - } - public String getRxPgz() { return rxPgz; } @@ -740,14 +757,6 @@ public class CancerScreeningModel extends BaseModel { this.sfBlzd = sfBlzd; } - public String getSfJcrq() { - return sfJcrq; - } - - public void setSfJcrq(String sfJcrq) { - this.sfJcrq = sfJcrq; - } - public String getSfZhzd() { return sfZhzd; } @@ -772,13 +781,6 @@ public class CancerScreeningModel extends BaseModel { this.sfZzjg = sfZzjg; } - public String getSfZlrq() { - return sfZlrq; - } - - public void setSfZlrq(String sfZlrq) { - this.sfZlrq = sfZlrq; - } public String getSfJszl() { return sfJszl; @@ -788,6 +790,14 @@ public class CancerScreeningModel extends BaseModel { this.sfJszl = sfJszl; } + public Date getSfJcsj() { + return sfJcsj; + } + + public void setSfJcsj(Date sfJcsj) { + this.sfJcsj = sfJcsj; + } + public String getSfJcjg() { return sfJcjg; } @@ -804,14 +814,6 @@ public class CancerScreeningModel extends BaseModel { this.sfJcry = sfJcry; } - public String getSfJcsj() { - return sfJcsj; - } - - public void setSfJcsj(String sfJcsj) { - this.sfJcsj = sfJcsj; - } - public Date getModified() { return modified; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java index f3a76d1..69ac3af 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java @@ -143,7 +143,7 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ //检査人员 private String rxlJcry; //检査日期 - private String rxlJcrq; + private Date rxlJcrq; //(四〉乳腺X线检査（未作X线检査不填写此项） //乳腺X线评估左 private String rxPgz; @@ -161,7 +161,7 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ //病理诊断者 private String sfBlzd; //病理检査日期 - private String sfJcrq; + private Date sfJcrq; //最后诊断 private String sfZhzd; //TNM分期 @@ -169,7 +169,7 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ //诊治机构 private String sfZzjg; //诊治日期 - private String sfZlrq; + private Date sfZlrq; //接受治疗情况 private String sfJszl; //检査机构 @@ -177,7 +177,7 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ //检查人员 private String sfJcry; //检査日期 - private String sfJcsj; + private Date sfJcsj; /** * 是否有效 */ @@ -712,14 +712,6 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ this.rxlJcry = rxlJcry; } - public String getRxlJcrq() { - return rxlJcrq; - } - - public void setRxlJcrq(String rxlJcrq) { - this.rxlJcrq = rxlJcrq; - } - public String getRxPgz() { return rxPgz; } @@ -776,14 +768,6 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ this.sfBlzd = sfBlzd; } - public String getSfJcrq() { - return sfJcrq; - } - - public void setSfJcrq(String sfJcrq) { - this.sfJcrq = sfJcrq; - } - public String getSfZhzd() { return sfZhzd; } @@ -808,14 +792,34 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ this.sfZzjg = sfZzjg; } - public String getSfZlrq() { + public Date getRxlJcrq() { + return rxlJcrq; + } + + public void setRxlJcrq(Date rxlJcrq) { + this.rxlJcrq = rxlJcrq; + } + + public Date getSfJcrq() { + return sfJcrq; + } + + public void setSfJcrq(Date sfJcrq) { + this.sfJcrq = sfJcrq; + } + + public Date getSfZlrq() { return sfZlrq; } - public void setSfZlrq(String sfZlrq) { + public void setSfZlrq(Date sfZlrq) { this.sfZlrq = sfZlrq; } + public void setSfJcsj(Date sfJcsj) { + this.sfJcsj = sfJcsj; + } + public String getSfJszl() { return sfJszl; } @@ -840,12 +844,7 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ this.sfJcry = sfJcry; } - public String getSfJcsj() { + public Date getSfJcsj() { return sfJcsj; } - - public void setSfJcsj(String sfJcsj) { - this.sfJcsj = sfJcsj; - } - } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index 31fc2c4..e8d7c6d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -2,6 +2,8 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.CancerScreeningService; +import com.lyms.platform.biz.service.ResidentsArchiveService; +import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; @@ -11,16 +13,14 @@ import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.CancerScreeningModel; +import com.lyms.platform.pojo.ResidentsArchiveModel; import com.lyms.platform.query.CancerScreeningQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @auther yangfei @@ -37,14 +37,17 @@ public class CancerScreeningFacade { private UsersService usersService; @Autowired private BasicConfigService basicConfigService; + @Autowired + private ResidentsArchiveService residentsArchiveService; /** * 获取当前医院或院组内的两癌检查列表 + * * @param queryRequest * @param id * @return */ - public BaseResponse list(CancerScreeningRequest queryRequest,Integer id) { + public BaseResponse list(CancerScreeningRequest queryRequest, Integer id) { //根据用户id获取医院ID String hospitalId = autoMatchFacade.getHospitalId(id); @@ -55,7 +58,7 @@ public class CancerScreeningFacade { query.setNeed("need"); query.setYn(YnEnums.YES.getId()); query.setQueryNo(queryRequest.getQueryNo()); - if (hospitalId!=null){ + if (hospitalId != null) { query.setHospitalId(hospitalId); } query.setProvinceId(queryRequest.getProvinceId()); @@ -63,15 +66,16 @@ public class CancerScreeningFacade { query.setAreaId(queryRequest.getAreaId()); List modelList = cancerScreenService.queryCancerScreList(query); - if (CollectionUtils.isNotEmpty(modelList)){ - for (CancerScreeningModel model : modelList){ - Map map = new HashMap<>(); - map.put("id",model.getId()); - map.put("name",model.getUsername()); + if (CollectionUtils.isNotEmpty(modelList)) { + for (CancerScreeningModel model : modelList) { + Map map = new HashMap<>(); + map.put("id", model.getId()); + map.put("name", model.getUsername()); map.put("cardNum", FunvCommonUtil.getId(model.getCertificateNum())); map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone())); - map.put("age",DateUtil.getAge(model.getBirthday())); + map.put("age", DateUtil.getAge(model.getBirthday())); map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService)); + map.put("sfZhzd",model.getSfZhzd()); } } return new BaseResponse(); @@ -79,21 +83,22 @@ public class CancerScreeningFacade { /** * 获取妇女两癌筛查列表 + * * @param residentId * @return */ public BaseResponse getResIdCancerScreenList(String residentId) { BaseResponse baseResponse = new BaseResponse(); List cancerScreeningModels = cancerScreenService.findResIdCancerScreenList(residentId); - List> hisCancerScrList = new ArrayList<>(); - for(CancerScreeningModel cs:cancerScreeningModels){ - Map map = new HashedMap(); - map.put("id",cs.getId()); + List> hisCancerScrList = new ArrayList<>(); + for (CancerScreeningModel cs : cancerScreeningModels) { + Map map = new HashedMap(); + map.put("id", cs.getId()); map.put("createTime", DateUtil.getyyyy_MM_dd(cs.getCreated())); //根据用户id获取医院ID Users users = usersService.getUsers(cs.getOperator()); - if(users!=null){ - map.put("operUser",users.getName()); + if (users != null) { + map.put("operUser", users.getName()); } hisCancerScrList.add(map); } @@ -104,24 +109,69 @@ public class CancerScreeningFacade { /** * 获取两癌筛查详情 + * * @param id * @return */ public BaseResponse getCancerScreenInfo(String id) { + BaseResponse baseResponse = new BaseResponse(); CancerScreeningModel cancerScreeningModel = cancerScreenService.findOneById(id); - return new BaseResponse(); + baseResponse.setObject(cancerScreeningModel); + return baseResponse; } public BaseResponse updateCancerScreen(CancerScreeningModel cancerScr, Integer id) { - return new BaseResponse(); + try { + cancerScr.setOperator(id); + cancerScreenService.updateOneCancerScreen(cancerScr,cancerScr.getId()); + return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); + } catch (Exception e) { + e.printStackTrace(); + return new BaseResponse(e.getMessage(), ErrorCodeConstants.SYSTEM_ERROR); + } } public BaseResponse addCancerScreen(CancerScreeningModel cancerScr, Integer id) { - //根据用户id获取医院ID - String hospitalId = autoMatchFacade.getHospitalId(id); - - - - return new BaseResponse(); + try { + ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.getResident(cancerScr.getResidentId()); + //冗余妇女建档数据 + if(residentsArchiveModel!=null){ + //姓名 + cancerScr.setUsername(residentsArchiveModel.getUsername()); + //出生日期 + cancerScr.setBirthday(residentsArchiveModel.getBirthday()); + //民族Id + cancerScr.setNationId(residentsArchiveModel.getNationId()); + //身份证件号 + cancerScr.setCertificateNum(residentsArchiveModel.getCertificateNum()); + //文化程度 + cancerScr.setLevelTypeId(residentsArchiveModel.getLevelTypeId()); + //手机号 + cancerScr.setPhone(residentsArchiveModel.getPhone()); + //居住地 + cancerScr.setProvinceId(residentsArchiveModel.getProvinceId()); + //市 + cancerScr.setCityId(residentsArchiveModel.getCityId()); + //区 + cancerScr.setAreaId(residentsArchiveModel.getAreaId()); + //街道 + cancerScr.setStreetId(residentsArchiveModel.getStreetId()); + //详细 + cancerScr.setAddress(residentsArchiveModel.getAddress()); + //根据用户id获取医院ID + String hospitalId = autoMatchFacade.getHospitalId(id); + //医院id + cancerScr.setHospitalId(hospitalId); + //操作人的id + cancerScr.setOperator(id); + cancerScreenService.addOneCancerScreen(cancerScr); + return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); + }else{ + return new BaseResponse("未传入的妇女建档id", ErrorCodeConstants.SUCCESS); + } + } catch (Exception e) { + e.printStackTrace(); + return new BaseResponse(e.getMessage(), ErrorCodeConstants.SYSTEM_ERROR); + } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 4bcea51..0931e1f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -151,6 +151,8 @@ public class PremaritalCheckupFacade { if (archiveModel!=null){ archiveMap = new HashMap<>(); archiveMap.put("certificateNum", archiveModel.getCertificateNum()); + archiveMap.put("archId", archiveModel.getId()); + archiveMap.put("levelType", FunvCommonUtil.getBaseicConfigByid(archiveModel.getLevelTypeId(), basicConfigService)); archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId()); archiveMap.put("username", archiveModel.getUsername()); archiveMap.put("age", DateUtil.getAge(archiveModel.getBirthday())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java index f39ab2f..8432d10 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java @@ -30,6 +30,8 @@ import java.io.OutputStream; import java.util.*; /** + * + * 妇女健康档案管理 * Created by Administrator on 2016/12/20 0020. */ @Component diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java index 4d7dde7..55c4f9f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java @@ -8,11 +8,11 @@ package com.lyms.platform.operate.web.request; public class CancerScreeningRequest extends BasePageQueryRequest { /** - * 孕周开始日期 + * 检查时间 */ private Integer checkDateStart; /** - * 孕周结束日期 + * 检查时间 */ private Integer checkDateEnd; /** -- 1.8.3.1