ccsens_zhengzhichuan
/
cga_v2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改整体报告单

whszxyjhyy
ccsens_zhengzhichuan 5 days ago
parent
344a385997
commit
e7d0bc56d7
3 changed files with 66 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java
  2. 62
      ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java
  3. 6
      ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/RmsDao.xml

17
ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java
View File

@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.ccsens.common.constant.CultureEnum;
import com.ccsens.common.constant.GenConstants;
import com.ccsens.common.constant.JobEnum;
import com.ccsens.common.enums.BaseEnum;
import com.ccsens.common.utils.PdfUtil;
import com.ccsens.system.domain.po.TzbsRmsReportResult;
@ -281,7 +282,23 @@ public class RmsVo {
@ApiModelProperty("出生日期")
private String birthday;
@ApiModelProperty("患者联系电话")
private String mobile;
@ApiModelProperty("婚姻状况1：未婚2：已婚 3：离异 4：丧偶 5：未知 ")
private Byte maritalStatus;
@ApiModelProperty("居住状态（1：独居 2：夫妻同住 3：多代加入同住； 4养老院； 5其他）")
private Byte dwellingState;
@ApiModelProperty("信仰")
private String belief;
public String getMarial(){
return maritalStatus == null ? "" : maritalStatus == 1 ? "未婚" : maritalStatus == 2 ? "已婚" : maritalStatus == 3 ? "离异" : maritalStatus == 4 ? "丧偶" : "未知";
}
public String getDwelling(){
return dwellingState == null ? "" : dwellingState == 1 ? "独居" : dwellingState == 2 ? "夫妻同住" : dwellingState == 3 ? "多代加入同住" : dwellingState == 4 ? "养老院" : "其他";
}
public List<PdfUtil.Row> toPdfRow() {
List<PdfUtil.Row> rows = getInitRows();
//第四栏

62
ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java
View File

@ -1756,17 +1756,17 @@ public class AmsReportServiceImpl implements AmsReportService {
params.put("doctor", pmsPatientBodyMap.get("doctor"));
params.put("admissionDate", pmsPatientBodyMap.get("admission_date"));
params.put("num", pmsPatientBodyMap.get("admission_count"));
params.put("admissionMethod", pmsPatientBodyMap.get("admission_method"));
params.put("admissionMethod", ObjectUtil.isNull(pmsPatientBodyMap.get("admission_method")) ? "" : ObjectUtil.equals(pmsPatientBodyMap.get("admission_method"), "1") ? "急诊": ObjectUtil.equals(pmsPatientBodyMap.get("admission_method"), "2") ? "门诊": ObjectUtil.equals(pmsPatientBodyMap.get("admission_method"), "3") ? "其他医疗机构转入": "其他");
params.put("bedNumber", pmsPatientBodyMap.get("bed_number"));
params.put("dischargeDate", pmsPatientBodyMap.get(""));
params.put("dischargeMethod", pmsPatientBodyMap.get("discharge_date"));
params.put("dischargeDate", ObjectUtil.isNull(pmsPatientBodyMap.get("dischargeDate")) ? "" : DateUtil.format(DateUtil.parse(pmsPatientBodyMap.get("dischargeDate").toString()), "yyyy-MM-dd"));
params.put("dischargeMethod", pmsPatientBodyMap.get("dischargeMethod"));
params.put("height", pmsPatientBodyMap.get("height"));
params.put("weight", pmsPatientBodyMap.get("weight"));
params.put("bmi", pmsPatientBodyMap.get("bmi"));
params.put("tz", pmsPatientBodyMap.get("tz"));
params.put("temperature", pmsPatientBodyMap.get("temperature"));
params.put("systolic_pressure", pmsPatientBodyMap.get("systolic_pressure"));
params.put("diastolic_pressure", pmsPatientBodyMap.get("diastolic_pressure"));
params.put("systolic_pressure", pmsPatientBodyMap.get("systolicPressure"));
params.put("diastolic_pressure", pmsPatientBodyMap.get("diastolicPressure"));
params.put("pulse", pmsPatientBodyMap.get("pulse"));
params.put("creatinine", pmsPatientBodyMap.get("creatinine"));
params.put("oxygen_saturation", pmsPatientBodyMap.get("oxygen_saturation"));
@ -2017,6 +2017,32 @@ public class AmsReportServiceImpl implements AmsReportService {
params.put("p_name", patientInfo.getPatientName());
params.put("p_sex", patientInfo.getSex() == 0 ? "男" : "女");
params.put("p_age", patientInfo.getPatientAge());
params.put("phone", patientInfo.getMobile());
if (dto.getVersion() != null) {
if(dto.getVersion() == 0) {
params.put("versionName", "完整版");
}
if(dto.getVersion() == 1) {
params.put("versionName", "医生版");
}
if(dto.getVersion() == 2) {
params.put("versionName", "个人版");
}
if(dto.getVersion() == 3) {
params.put("versionName", "阳性版");
}
}
if (patientInfo.getCareer() != null) {
JobEnum jobEnum = BaseEnum.codeOf(JobEnum.class, patientInfo.getCareer().intValue());
if (jobEnum != null) {
params.put("job", jobEnum.getDesc());
}
}
params.put("marital", patientInfo.getMarial());
params.put("dwelling", patientInfo.getDwelling());
params.put("nation", patientInfo.getNation());
params.put("belief", patientInfo.getBelief());
params.put("testerName", patientInfo.getTesterName());
CultureEnum cultureEnum = null;
if (dto.getSignId() != null) {
HmsDoctorSign emsEvaluationInformedConsent = hmsDoctorSignMapper.selectByPrimaryKey(dto.getSignId());
@ -2068,30 +2094,30 @@ public class AmsReportServiceImpl implements AmsReportService {
params.put("hobby", patientInfoById.getHobby());
params.put("aboBlood", patientInfoById.getAboBloodType());
params.put("rhBlood", patientInfoById.getRhBloodType());
params.put("visit_type", pmsPatientBodyMap.get("visit_type"));
params.put("visitNo", pmsPatientBodyMap.get("outpatient_no"));
params.put("visit_type", ObjectUtil.isEmpty(pmsPatientBodyMap.get("visitType")) ? "" : ObjectUtil.equals(pmsPatientBodyMap.get("visitType"), "1") ? "门诊" : "住院");
params.put("visitNo", pmsPatientBodyMap.get("outpatientNo"));
params.put("age", pmsPatientBodyMap.get("age"));
params.put("dept", pmsPatientBodyMap.get("department"));
params.put("doctor", pmsPatientBodyMap.get("doctor"));
params.put("admissionDate", pmsPatientBodyMap.get("admission_date"));
params.put("num", pmsPatientBodyMap.get("admission_count"));
params.put("admissionMethod", pmsPatientBodyMap.get("admission_method"));
params.put("bedNumber", pmsPatientBodyMap.get("bed_number"));
params.put("dischargeDate", pmsPatientBodyMap.get(""));
params.put("dischargeMethod", pmsPatientBodyMap.get("discharge_date"));
params.put("admissionDate", ObjectUtil.isEmpty(pmsPatientBodyMap.get("admissionDate")) ? "": DateUtil.format(DateUtil.parse(pmsPatientBodyMap.get("admissionDate").toString()), "yyyy-MM-dd"));
params.put("num", pmsPatientBodyMap.get("admissionCount"));
params.put("admissionMethod", ObjectUtil.isNull(pmsPatientBodyMap.get("admissionMethod")) ? "" : ObjectUtil.equals(pmsPatientBodyMap.get("admissionMethod"), "1") ? "急诊": ObjectUtil.equals(pmsPatientBodyMap.get("admissionMethod"), "2") ? "门诊": ObjectUtil.equals(pmsPatientBodyMap.get("admissionMethod"), "3") ? "其他医疗机构转入": "其他");
params.put("bedNumber", pmsPatientBodyMap.get("bedNumber"));
params.put("dischargeDate", ObjectUtil.isEmpty(pmsPatientBodyMap.get("dischargeDate")) ? "": DateUtil.format(DateUtil.parse(pmsPatientBodyMap.get("dischargeDate").toString()), "yyyy-MM-dd"));
params.put("dischargeMethod", ObjectUtil.isNull(pmsPatientBodyMap.get("dischargeMethod")) ? "": ObjectUtil.equals(pmsPatientBodyMap.get("dischargeMethod"), "1") ? "医嘱离院" : ObjectUtil.equals(pmsPatientBodyMap.get("dischargeMethod"), "2") ? "医嘱转院" :ObjectUtil.equals(pmsPatientBodyMap.get("dischargeMethod"), "3") ? "医嘱转社区卫生服务机构/乡镇卫生院":ObjectUtil.equals(pmsPatientBodyMap.get("dischargeMethod"), "4") ? "非医嘱离院":ObjectUtil.equals(pmsPatientBodyMap.get("dischargeMethod"), "5") ? "死亡": "其他");
params.put("height", pmsPatientBodyMap.get("height"));
params.put("weight", pmsPatientBodyMap.get("weight"));
params.put("bmi", pmsPatientBodyMap.get("bmi"));
params.put("tz", pmsPatientBodyMap.get("tz"));
params.put("temperature", pmsPatientBodyMap.get("temperature"));
params.put("systolic_pressure", pmsPatientBodyMap.get("systolic_pressure"));
params.put("diastolic_pressure", pmsPatientBodyMap.get("diastolic_pressure"));
params.put("systolic_pressure", pmsPatientBodyMap.get("systolicPressure"));
params.put("diastolic_pressure", pmsPatientBodyMap.get("diastolicPressure"));
params.put("pulse", pmsPatientBodyMap.get("pulse"));
params.put("creatinine", pmsPatientBodyMap.get("creatinine"));
params.put("oxygen_saturation", pmsPatientBodyMap.get("oxygen_saturation"));
params.put("oxygen_saturation", pmsPatientBodyMap.get("oxygenSaturation"));
params.put("albumin", pmsPatientBodyMap.get("albumin"));
params.put("total_protein", pmsPatientBodyMap.get("total_protein"));
params.put("vitamin_d3", pmsPatientBodyMap.get("vitamin_d3"));
params.put("total_protein", pmsPatientBodyMap.get("totalProtein"));
params.put("vitamin_d3", pmsPatientBodyMap.get("vitaminD3"));
params.put("hematocrit", pmsPatientBodyMap.get("hematocrit"));
params.put("dimer", pmsPatientBodyMap.get("dimer"));
}

6
ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/RmsDao.xml
View File

@ -44,7 +44,11 @@
b.doctor,
ee.version,
h.version AS versionName,
pp.birthday
pp.birthday,
pp.marital_status as maritalStatus,
pp.dwelling_state as dwellingState,
pp.nation,
pp.belief
FROM
ems_evaluation ee
LEFT JOIN rms_report rr on ee.id = rr.evaluation_id

Write Preview
Loading…
Cancel
Save