ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java
@@ -248,7 +248,7 @@ @ApiOperation(value = "根据用户id查询检测信息") @GetMapping(value = "/getInspectionByAppUserId") public R<List<TSysInspection>> getInspectionByAppUserId(@RequestParam String appUserId) { // 订单信息 // 检测信息 List<TSysInspection> sysInspections = sysInspectionService.list(Wrappers.lambdaQuery(TSysInspection.class).eq(TSysInspection::getAppUserId, appUserId)); return R.ok(sysInspections); } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysInspectionController.java
@@ -15,6 +15,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -85,6 +86,20 @@ crmClinic = crmClinicService.getById(sysUser.getObjectId()); } dto.setClinicId(crmClinic.getId()); // 查询该诊所最新的一条检测记录 TSysInspection sysInspection = sysInspectionService.getOne(Wrappers.lambdaQuery(TSysInspection.class) .eq(TSysInspection::getClinicId, crmClinic.getId()) .orderByDesc(TSysInspection::getCreateTime) .last("LIMIT 1")); if(StringUtils.hasLength(sysInspection.getPrescriptionNumber())){ // 生成处方编号 总共六位数字，不满6位前面补0 String prescriptionNumber = sysInspection.getPrescriptionNumber(); prescriptionNumber = prescriptionNumber.substring(prescriptionNumber.length() - 6); prescriptionNumber = String.format("%06d", Integer.parseInt(prescriptionNumber) + 1); dto.setPrescriptionNumber(prescriptionNumber); }else{ dto.setPrescriptionNumber("000001"); } dto.setInspectionType(1); return R.ok(sysInspectionService.save(dto)); } ruoyi-system/src/main/java/com/ruoyi/system/model/TSysInspection.java
@@ -151,5 +151,112 @@ @TableField(exist = false) private String orderId; @ApiModelProperty(value = "入院次数") @TableField("hospitalization_count") private String hospitalizationCount; @ApiModelProperty(value = "住院号") @TableField("hospitalization_number") private String hospitalizationNumber; @ApiModelProperty(value = "出生地") @TableField("birthplace") private String birthplace; @ApiModelProperty(value = "民族") @TableField("nation") private String nation; @ApiModelProperty(value = "入院日期") @TableField("admission_date") private String admissionDate; @ApiModelProperty(value = "婚姻状况") @TableField("marital_status") private String maritalStatus; @ApiModelProperty(value = "记录日期") @TableField("record_date") private String recordDate; @ApiModelProperty(value = "职业") @TableField("occupation") private String occupation; @ApiModelProperty(value = "病史陈述者") @TableField("history_narrator") private String historyNarrator; @ApiModelProperty(value = "主诉") @TableField("chief_complaint") private String chiefComplaint; @ApiModelProperty(value = "既往史") @TableField("past_medical_history") private String pastMedicalHistory; @ApiModelProperty(value = "月经史") @TableField("menstrual_history") private String menstrualHistory; @ApiModelProperty(value = "婚育史") @TableField("obstetric_history") private String obstetricHistory; @ApiModelProperty(value = "家族史") @TableField("family_history") private String familyHistory; @ApiModelProperty(value = "体温") @TableField("body_temperature") private String bodyTemperature; @ApiModelProperty(value = "脉搏") @TableField("pulse") private String pulse; @ApiModelProperty(value = "呼吸") @TableField("breathe") private String breathe; @ApiModelProperty(value = "血压") @TableField("blood_pressure") private String bloodPressure; @ApiModelProperty(value = "一般情况") @TableField("general_situation") private String generalSituation; @ApiModelProperty(value = "费别") @TableField("fee_category") private String feeCategory; @ApiModelProperty(value = "处方编号") @TableField("prescription_number") private String prescriptionNumber; @ApiModelProperty(value = "科室") @TableField("department_name") private String departmentName; @ApiModelProperty(value = "处方时间") @TableField("prescription_time") private String prescriptionTime; @ApiModelProperty(value = "家庭住址") @TableField("home_address") private String homeAddress; @ApiModelProperty(value = "临床诊断") @TableField("clinical_diagnosis") private String clinicalDiagnosis; @ApiModelProperty(value = "处方内容") @TableField("prescription_content") private String prescriptionContent; @ApiModelProperty(value = "处方备注") @TableField("remarks") private String remarks; } ruoyi-system/src/main/resources/mapper/system/TSysInspectionMapper.xml
@@ -31,6 +31,33 @@ <result column="create_by" property="createBy" /> <result column="update_by" property="updateBy" /> <result column="disabled" property="disabled" /> <result column="hospitalization_count" property="hospitalizationCount" /> <result column="hospitalization_number" property="hospitalizationNumber" /> <result column="birthplace" property="birthplace" /> <result column="nation" property="nation" /> <result column="admission_date" property="admissionDate" /> <result column="marital_status" property="maritalStatus" /> <result column="record_date" property="recordDate" /> <result column="occupation" property="occupation" /> <result column="history_narrator" property="historyNarrator" /> <result column="chief_complaint" property="chiefComplaint" /> <result column="past_medical_history" property="pastMedicalHistory" /> <result column="menstrual_history" property="menstrualHistory" /> <result column="obstetric_history" property="obstetricHistory" /> <result column="family_history" property="familyHistory" /> <result column="body_temperature" property="bodyTemperature" /> <result column="pulse" property="pulse" /> <result column="breathe" property="breathe" /> <result column="blood_pressure" property="bloodPressure" /> <result column="general_situation" property="generalSituation" /> <result column="fee_category" property="feeCategory" /> <result column="prescription_number" property="prescriptionNumber" /> <result column="department_name" property="departmentName" /> <result column="prescription_time" property="prescriptionTime" /> <result column="home_address" property="homeAddress" /> <result column="clinical_diagnosis" property="clinicalDiagnosis" /> <result column="prescription_content" property="prescriptionContent" /> <result column="remarks" property="remarks" /> </resultMap> <!-- 通用查询结果列 --> @@ -46,7 +73,13 @@ tsi.check_time,tsi.inspection_info,tsi.inspection_type,tsi.is_pay, tsi.create_time, tsi.update_time, tsi.create_by, tsi.update_by, tsi.disabled, tsi.create_id,tsi.report_print_url, tsi.present_history, tsi.tcm_syndrome, tsi.disease_history_memo,tsi.western_medicine_diagnosis, tsi.three_user_id, tsi.phone, tsi.device_account_id, tsi.face_result_id, tsi.tongue_result_id,tau.nick_name as nickName tsi.phone, tsi.device_account_id, tsi.face_result_id, tsi.tongue_result_id,tsi.hospitalization_count, tsi.hospitalization_number, tsi.birthplace, tsi.nation, tsi.admission_date,tsi.marital_status, tsi.record_date, tsi.occupation, tsi.history_narrator, tsi.chief_complaint,tsi.past_medical_history, tsi.menstrual_history, tsi.obstetric_history, tsi.family_history,tsi.body_temperature, tsi.pulse, tsi.breathe,tsi.blood_pressure, tsi.general_situation, tsi.fee_category, tsi.prescription_number, tsi.department_name, tsi.prescription_time, tsi.home_address, tsi.clinical_diagnosis,tsi.prescription_content, tsi.remarks,tau.nick_name as nickName FROM t_sys_inspection tsi left join t_sys_app_user tau on tsi.app_user_id = tau.id <where>
