From e7a675a3cb3d648d2f70bf6ff1db3acbf4242cbc Mon Sep 17 00:00:00 2001 From: haorp <754760654@qq.com> Date: Wed, 18 Jun 2025 10:03:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E5=BB=BA=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/permission/model/MedicalRecordVo.java | 52 ++++++++++++++++++++++ .../resources/mainOrm/master/AppointmentMapper.xml | 16 +++---- .../operate/web/facade/MedicalRecordFacade.java | 29 +++++++++--- .../platform/operate/web/facade/PatientFacade.java | 20 ++++++++- .../operate/web/facade/PatientServiceFacade.java | 3 ++ .../operate/web/result/QuanChanResult.java | 11 +++++ 6 files changed, 115 insertions(+), 16 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/MedicalRecordVo.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/MedicalRecordVo.java index 94c3254..325cdd6 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/MedicalRecordVo.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/MedicalRecordVo.java @@ -77,6 +77,58 @@ public class MedicalRecordVo extends BaseQuery { /** 创建时间 */ private String created; + private String height; + + private String weight; + + // 诊断标签 + private String mdtrtTag; + + // 主管医生 + private String mainDoctor; + + // 建档标志 + private String patientsType; + + public String getPatientsType() { + return patientsType; + } + + public void setPatientsType(String patientsType) { + this.patientsType = patientsType; + } + + public String getMdtrtTag() { + return mdtrtTag; + } + + public void setMdtrtTag(String mdtrtTag) { + this.mdtrtTag = mdtrtTag; + } + + public String getMainDoctor() { + return mainDoctor; + } + + public void setMainDoctor(String mainDoctor) { + this.mainDoctor = mainDoctor; + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } public String getBabyWeight() { return babyWeight; diff --git a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml index 683ff40..1497499 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml @@ -303,17 +303,17 @@ DEPARTMENT = #{department}, - - DIAGNOSIS = #{diagnosis}, + + mdtrt_tag = #{mdtrtTag}, - - DIAGNOSIS_CODE = #{diagnosisCode}, + + main_doctor = #{mainDoctor}, - - OPERATION = #{operation}, + + weight = #{weight}, - - OPERATION_CODE = #{operationCode}, + + height = #{height}, MEDICINE = #{medicine}, diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicalRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicalRecordFacade.java index e04d249..dd98551 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicalRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicalRecordFacade.java @@ -45,6 +45,14 @@ public class MedicalRecordFacade { if(CollectionUtils.isEmpty(medicalRecordVoList)){ return new BaseListResponse().setData(medicalRecordVoList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("未查询到有效数据"); } + + for (MedicalRecordVo recordVo : medicalRecordVoList) { + if("0".equals(recordVo.getPatientsType())){ + recordVo.setPatientsType("已建档"); + }else{ + recordVo.setPatientsType("为建档"); + } + } PageInfo pageInfo = new PageInfo(); pageInfo.setCount(medicalRecordVo.getCount()); pageInfo.setPage(medicalRecordVo.getPage()); @@ -61,7 +69,12 @@ public class MedicalRecordFacade { if(CollectionUtils.isEmpty(medicalRecordVoList)){ return new BaseListResponse().setData(medicalRecordVoList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("未查询到有效数据"); } - return new BaseObjectResponse().setData(medicalRecordVoList.get(0)).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); + MedicalRecordVo recordVo = medicalRecordVoList.get(0); + String age1 = recordVo.getAge().substring(0,8); + Date date = DateUtil.parseYYYYMMDD(age1); + int age = DateUtil.getYearSpace(new Date(),date); + recordVo.setAge(String.valueOf(age)); + return new BaseObjectResponse().setData(recordVo).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } @@ -112,11 +125,15 @@ public class MedicalRecordFacade { patientsService.addPatient(patient); // 更新诊断 - MedicalRecordVo insertVo = new MedicalRecordVo(); - insertVo.setModified(DateUtil.getyyyy_MM_dd_hms(new Date())); - insertVo.setCardNo(medicalRecordVo.getCardNo()); - insertVo.setDiagnosis(medicalRecordVo.getDiagnosis()); - appointmentService.updateMedicalRecord(insertVo); + MedicalRecordVo updateVo = new MedicalRecordVo(); + updateVo.setModified(DateUtil.getyyyy_MM_dd_hms(new Date())); + updateVo.setCardNo(medicalRecordVo.getCardNo()); + updateVo.setMdtrtTag(medicalRecordVo.getMdtrtTag()); + updateVo.setMainDoctor(medicalRecordVo.getMainDoctor()); + updateVo.setHeight(medicalRecordVo.getHeight()); + updateVo.setWeight(medicalRecordVo.getWeight()); + updateVo.setPatientsType("0"); + appointmentService.updateMedicalRecord(updateVo); return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index a6d29c1..ea1efd7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -822,7 +822,7 @@ public class PatientFacade extends BaseServiceImpl { data = convertToQuanPatient(patientses, userId, hospital); //处理全部产妇 } else if (type == 3) { - data = convertToQuanCPatient(patientses, userId, hospital); + data = convertToQuanCPatient(patientses, userId, hospital,type); } } // if (StringUtils.isNotEmpty(hospital)) { @@ -2190,7 +2190,7 @@ public class PatientFacade extends BaseServiceImpl { * @param patientses 符合条件的产妇 * @return */ - private List convertToQuanCPatient(List patientses, Integer userId, String hospital) { + private List convertToQuanCPatient(List patientses, Integer userId, String hospital,Integer type) { List data = new ArrayList <>(); int batchSize = 4; @@ -2222,6 +2222,22 @@ public class PatientFacade extends BaseServiceImpl { result.setRealPhone(StringUtils.encryPhone(result.getRealPhone())); } } + + if(CollectionUtils.isNotEmpty(data) && hospital.equals("2100002419") && type == 3){ + for(QuanChanResult result: data){ + MedicalRecordVo medicalRecordVo = new MedicalRecordVo(); + medicalRecordVo.setCardNo(result.getCardNo()); + List queryList = appointmentService.queryList(medicalRecordVo); + if(CollectionUtils.isNotEmpty(queryList)){ + if(StringUtils.isNotEmpty(queryList.get(0).getMdtrtTag())){ + result.setMdtrtTag(queryList.get(0).getMdtrtTag()); + } + } + } + } + + + return data; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index bad71fef..adc0510 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -733,6 +733,9 @@ public class PatientServiceFacade { } Date lastMenses = patients.getLastMenses(); + if(patients.getLastMenses() == null){ + lastMenses = patients.getFmDate(); + } Integer serviceWeek = pser.getServiceWeek(); Integer doctorService = pser.getDoctorWeek(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java index 47f0f5a..5c46bf7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java @@ -130,6 +130,17 @@ public class QuanChanResult implements IBasicResultConvert