From 0aebfe59e50b3808dfba8c0b730c417c8214c852 Mon Sep 17 00:00:00 2001 From: wtt Date: Thu, 17 Sep 2020 16:45:09 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/pojo/BreastModel.java | 9 ---- .../lyms/platform/pojo/FamilyPlanningModel.java | 17 +++----- .../operate/web/controller/BreastController.java | 15 +++++++ .../platform/operate/web/facade/BreastFacade.java | 50 ++++++++++++++++++---- .../operate/web/facade/FamilyPlanningFacade.java | 49 +++++++++++++++------ .../operate/web/request/BreastRequest.java | 11 +---- .../platform/operate/web/result/BreastResult.java | 10 ----- .../operate/web/result/FamilyPlanningResult.java | 10 ----- 8 files changed, 98 insertions(+), 73 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BreastModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BreastModel.java index 2d25ef0..41d7dc5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BreastModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BreastModel.java @@ -20,7 +20,6 @@ public class BreastModel extends BaseModel { /*基础信息*/ private String id; private Integer yn; - private String parentId; private String pid; private Date createDate; private Date modifyDate; @@ -86,14 +85,6 @@ public class BreastModel extends BaseModel { this.yn = yn; } - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - public String getPid() { return pid; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/FamilyPlanningModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/FamilyPlanningModel.java index 954f8b9..d0a4cdc 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/FamilyPlanningModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/FamilyPlanningModel.java @@ -21,7 +21,6 @@ public class FamilyPlanningModel extends BaseModel { private String id; private Integer yn; private String parentId; - private String pid; private Date createDate; private Date modifyDate; private String hospitalId; @@ -88,7 +87,7 @@ public class FamilyPlanningModel extends BaseModel { /*辅助检查*/ //血常规 private String fzxcg; - //血常规 + //其他 private String fzxqt; /*B超*/ @@ -122,7 +121,7 @@ public class FamilyPlanningModel extends BaseModel { private String sscxl; //吸出物：绒毛(yes 有/ no无) private String ssxcwYesOrNo; - //胚囊 yesOrNo(yes有no/无)约_____ size 大小 + //胚囊 yesOrNo(yes 有no/无)约_____ size 大小 private Map pn; //术中用药及特殊情况： private String szyyjtsqk; @@ -137,9 +136,9 @@ public class FamilyPlanningModel extends BaseModel { private String yjjh; //宫颈深度__cm private String shgjsd; - //手术：key:state shu顺利/ kun困难（ details 详情：_________） + //手术：key:state shu 顺利/ kun困难（ details 详情：_________） private Map operationState; - //出血：yesOrNo(yes有no/无) value ___ml + //出血：yesOrNo(yes 有no/无) value ___ml private Map hemorrhage; //腹痛：1轻/2无/3中/4重： private String ft; @@ -147,7 +146,7 @@ public class FamilyPlanningModel extends BaseModel { private String gnjyqzl; //宫内节育器 大小___号 private String gnjyqSize; - //尾丝：无/有____cm + //尾丝：yesOrNo(yes 有no/无) value ___ml private Map ws; //术中用药及特殊情况： private String szyyqk; @@ -184,13 +183,7 @@ public class FamilyPlanningModel extends BaseModel { this.parentId = parentId; } - public String getPid() { - return pid; - } - public void setPid(String pid) { - this.pid = pid; - } public Date getCreateDate() { return createDate; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java index 52de322..c0b8c89 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.BreastFacade; +import com.lyms.platform.operate.web.request.AntenatalExaminationQueryRequest; import com.lyms.platform.operate.web.request.BreastRequest; import com.lyms.platform.query.BreastModelQuery; import com.lyms.platform.query.FamilyPlanningModelQuery; @@ -35,6 +36,20 @@ public class BreastController extends BaseController { * @param request * @return */ + @RequestMapping(method = RequestMethod.GET, value = "/getPatient") + @ResponseBody + @TokenRequired + public BaseResponse getPatient(@Valid AntenatalExaminationQueryRequest request, HttpServletRequest httpServletRequest) { + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + BaseResponse baseResponse = breastFacade.getPatient(request, loginState.getId()); + return baseResponse; + } + + /** + * 添加或者修改 + * @param request + * @return + */ @RequestMapping(method = RequestMethod.POST, value = "/addOrUp") @ResponseBody @TokenRequired diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java index 59de519..9d95561 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java @@ -12,6 +12,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.operate.web.request.AntenatalExaminationQueryRequest; import com.lyms.platform.operate.web.request.BreastRequest; import com.lyms.platform.operate.web.result.BabyHighRiskBabyResult; import com.lyms.platform.operate.web.result.BreastResult; @@ -23,10 +24,7 @@ import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.BabyHighRiskBabyModelQuery; -import com.lyms.platform.query.BasicConfigQuery; -import com.lyms.platform.query.BreastModelQuery; -import com.lyms.platform.query.FamilyPlanningModelQuery; +import com.lyms.platform.query.*; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -73,9 +71,14 @@ public class BreastFacade extends BaseServiceImpl { BreastModel model = new BreastModel(); model.setYn(YnEnums.YES.getId()); - Patients patients = patientsService.findOnePatientById(request.getParentId()); - if (patients != null) { - model.setParentId(patients.getId()); + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setPid(request.getPid()); + patientsQuery.setHospitalId(request.getHospitalId()); + patientsQuery.setYn(YnEnums.YES.getId()); + List list = patientsService.queryPatient1(patientsQuery, "created"); + + if (CollectionUtils.isNotEmpty(list)) { + Patients patients = list.get(0); model.setPid(patients.getPid()); model.setModifyDate(new Date()); model.setName(patients.getUsername()); @@ -102,17 +105,46 @@ public class BreastFacade extends BaseServiceImpl { return model; } + /** + * 获取孕妇建档不区分产妇孕妇 + */ + public BaseResponse getPatient (AntenatalExaminationQueryRequest request, Integer userId) { + Patients patients = null; + + try { + String hospitalId = autoMatchFacade.getHospitalId(userId); + PatientsQuery patientsQuery = new PatientsQuery(); + if(StringUtils.isNotEmpty(request.getCardNo()) || StringUtils.isNotEmpty(request.getVcCardNo())){ + patientsQuery.setCardNo(request.getCardNo()); + patientsQuery.setVcCardNo(request.getVcCardNo()); + patientsQuery.setHospitalId(hospitalId); + patientsQuery.setYn(YnEnums.YES.getId()); + List list = patientsService.queryPatient1(patientsQuery, "created"); + if(CollectionUtils.isNotEmpty(list)){ + patients = list.get(0); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + BaseObjectResponse br = new BaseObjectResponse(); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + br.setData(patients); + return br; + } /** * 新增 */ public BaseResponse add(BreastRequest request, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); + request.setHospitalId(hospitalId); BreastModel model = getBreastModel(request); model.setCreateDate(new Date()); model.setHospitalId(hospitalId); - + model = breastService.add(model); if (model != null && model.getId() != null) { operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), model, model, OptActionEnums.ADD.getId(), "乳腺检查新增"); @@ -134,7 +166,7 @@ public class BreastFacade extends BaseServiceImpl { if (StringUtils.isEmpty(request.getId())) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("ID不能为空"); } - + request.setHospitalId(hospitalId); BreastModel model = getBreastModel(request); BreastModel models = breastService.queryById(request.getId()); if (models != null && models.getId() != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FamilyPlanningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FamilyPlanningFacade.java index 50050c8..0c615b9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FamilyPlanningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FamilyPlanningFacade.java @@ -19,6 +19,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.BabyStuntingModel; import com.lyms.platform.pojo.FamilyPlanningModel; import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.ResidentsArchiveModel; import com.lyms.platform.query.BabyStuntingQuery; import com.lyms.platform.query.FamilyPlanningModelQuery; import org.apache.commons.lang.math.NumberUtils; @@ -28,7 +29,7 @@ import org.springframework.stereotype.Component; import java.util.*; /** - * 乳腺检查 逻辑处理 + * 计生项目 逻辑处理 * * @Author: 武涛涛 * @Date: 2020/9/15 9:40 @@ -56,7 +57,8 @@ public class FamilyPlanningFacade extends BaseServiceImpl { private BasicConfigService basicConfigService; @Autowired private PatientsService patientsService; - + @Autowired + private ResidentsArchiveService residentsArchiveService; /** * 构造保存对象 * @@ -67,16 +69,16 @@ public class FamilyPlanningFacade extends BaseServiceImpl { FamilyPlanningModel model = new FamilyPlanningModel(); model.setYn(YnEnums.YES.getId()); - Patients patients = patientsService.findOnePatientById(request.getParentId()); - if (patients != null) { - model.setParentId(patients.getId()); - model.setPid(patients.getPid()); + + ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.getResident(request.getParentId()); + if (residentsArchiveModel != null) { + model.setParentId(residentsArchiveModel.getId()); model.setModifyDate(new Date()); - model.setName(patients.getUsername()); - model.setAge(patients.getAge() == null ? "" : patients.getAge().toString()); - model.setCertNo(patients.getCardNo()); - model.setPhone(patients.getPhone()); - model.setVcCardNo(patients.getVcCardNo()); + model.setName(residentsArchiveModel.getUsername()); + model.setAge(residentsArchiveModel.getAge() == null ? "" : residentsArchiveModel.getAge().toString()); + model.setCertNo(residentsArchiveModel.getCertificateNum()); + model.setPhone(residentsArchiveModel.getPhone()); + model.setVcCardNo(residentsArchiveModel.getVcCardNo()); //createDate,hospitalId调用外添加赋值 } model.setSsxm(request.getSsxm()); @@ -146,7 +148,7 @@ public class FamilyPlanningFacade extends BaseServiceImpl { model = familyPlanningService.add(model); if (model != null && model.getId() != null) { - operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), model, model, OptActionEnums.ADD.getId(), "乳腺检查新增"); + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), model, model, OptActionEnums.ADD.getId(), "计生项目新增"); } BaseObjectResponse br = new BaseObjectResponse(); br.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -170,7 +172,7 @@ public class FamilyPlanningFacade extends BaseServiceImpl { FamilyPlanningModel models = familyPlanningService.queryById(request.getId()); if (models != null && models.getId() != null) { familyPlanningService.update(model, request.getId()); - operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), models, model, OptActionEnums.UPDATE.getId(), "乳腺检查更新"); + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), models, model, OptActionEnums.UPDATE.getId(), "计生项目更新"); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); @@ -189,7 +191,7 @@ public class FamilyPlanningFacade extends BaseServiceImpl { FamilyPlanningModel checkModel = familyPlanningService.queryById(id); if (checkModel != null && checkModel.getId() != null) { familyPlanningService.deleteById(id); - operateLogFacade.addDeleteOptLog(userId, Integer.valueOf(hospitalId), checkModel, OptActionEnums.DELETE.getId(), "乳腺检查删除"); + operateLogFacade.addDeleteOptLog(userId, Integer.valueOf(hospitalId), checkModel, OptActionEnums.DELETE.getId(), "计生项目删除"); } } @@ -214,6 +216,25 @@ public class FamilyPlanningFacade extends BaseServiceImpl { if (StringUtils.isNotEmpty(familyPlanningModel.getHospitalId())) { familyPlanningResult.setHospitalName(CommonsHelper.getHospitalName(familyPlanningModel.getHospitalId(), organizationService)); } + if("1".equals(familyPlanningResult.getJl())){ + familyPlanningResult.setJl("多"); + }else if("2".equals(familyPlanningResult.getJl())){ + familyPlanningResult.setJl("中"); + } else if("3".equals(familyPlanningResult.getJl())){ + familyPlanningResult.setJl("少"); + } + if("1".equals(familyPlanningResult.getTj())){ + familyPlanningResult.setTj("无"); + }else if("2".equals(familyPlanningResult.getTj())){ + familyPlanningResult.setTj("轻"); + } else if("3".equals(familyPlanningResult.getTj())){ + familyPlanningResult.setTj("重"); + } + if("1".equals(familyPlanningResult.getShousNm())){ + familyPlanningResult.setShousNm("负压吸宫术"); + }else if("2".equals(familyPlanningResult.getShousNm())){ + familyPlanningResult.setShousNm("钳刮术"); + } br.setData(familyPlanningResult); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BreastRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BreastRequest.java index cb07f32..2ec607e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BreastRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BreastRequest.java @@ -15,10 +15,9 @@ public class BreastRequest { /*基础信息*/ private String id; private Integer yn; - //建档ID + //建档 pid @FormParam - @NotEmpty(message = "建档ID不能为空.") - private String parentId; + @NotEmpty(message = "建档pid不能为空.") private String pid; private String createDate; private String modifyDate; @@ -87,9 +86,6 @@ public class BreastRequest { this.yn = yn; } - public String getParentId() { - return parentId; - } public String getInspectionPhaseName() { return inspectionPhaseName; @@ -99,9 +95,6 @@ public class BreastRequest { this.inspectionPhaseName = inspectionPhaseName; } - public void setParentId(String parentId) { - this.parentId = parentId; - } public String getPid() { return pid; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BreastResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BreastResult.java index 54a4e7e..63fc2b0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BreastResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BreastResult.java @@ -16,7 +16,6 @@ public class BreastResult implements IBasicResultConvert