代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -6008,7 +6008,10 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    }
    public List<WlyyHospitalSysDictDO> findCancelReasonList() {
    public List<WlyyHospitalSysDictDO> findCancelReasonList(String type) {
        if("28".equals(type)){
            return sysDictDao.findByDictName("PatientCancel28");
        }
        return sysDictDao.findByDictName("PatientCancel");
    }

common/common-entity/src/db/2023.sql

@@ -461,4 +461,23 @@ CREATE TABLE `wlyy_patient_device_log` (
   PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=12773 DEFAULT CHARSET=utf8mb4;
ALTER table wlyy_patient_health_index add COLUMN `is_upload` tinyint(1) DEFAULT NULL COMMENT '是否上传物联网 0和null否 1是，2失败';
ALTER table wlyy_patient_health_index add COLUMN `is_upload` tinyint(1) DEFAULT NULL COMMENT '是否上传物联网 0和null否 1是，2失败';
-- 2023-12-25 ysj
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('PatientCancel28', NULL, 'PatientCancel28', '1', '咨询信息填写错误', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('PatientCancel281', NULL, 'PatientCancel28', '2', '临时有事，无法按时复诊', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('PatientCancel282', NULL, 'PatientCancel28', '3', '其他', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
CREATE TABLE `wlyy_patient_aim_sports` (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id主键，与业务主键无关',
   `code` varchar(50) NOT NULL COMMENT '业务主键UUID',
   `patientcode` varchar(50) DEFAULT NULL COMMENT '患者CODE',
   `daily_step_count` int(11) DEFAULT NULL COMMENT '每日步数',
   `bmi_max` varchar(10) DEFAULT NULL COMMENT '体重指数BMI标准值上限',
   `bmi_min` varchar(10) DEFAULT NULL COMMENT '体重指数BMI标准值下限',
   `create_date` varchar(10) DEFAULT NULL COMMENT '上传日期',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`patientcode`,`create_date`) USING BTREE
) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4 COMMENT='患者-运动目标';

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -1274,10 +1274,11 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findCancelReasonList)
    @ApiOperation(value = "获取居民取消原因字典", notes = "获取居民取消原因字典")
    public ListEnvelop findCancelReasonList() {
    public ListEnvelop findCancelReasonList(@ApiParam(name = "type", value = "咨询类型")
                                            @RequestParam(value = "type", required = false) String type) {
        try {
            return success(prescriptionService.findCancelReasonList());
            return success(prescriptionService.findCancelReasonList(type));
        } catch (Exception e) {
            e.printStackTrace();
            return failedListEnvelopException(e);

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/controller/WlyyDoorServiceOrderController.java

@@ -93,12 +93,17 @@ public class WlyyDoorServiceOrderController extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1") @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15") @RequestParam(value = "size") int size
    ) {
        JSONObject result = wlyyDoorServiceOrderService.queryInfoList(patient, status, page, size);
        if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
            return PageEnvelop.getError(result.getString(ResponseContant.resultMsg), -1);
        try {
            JSONObject result = wlyyDoorServiceOrderService.queryInfoList(patient, status, page, size);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return PageEnvelop.getError(result.getString(ResponseContant.resultMsg), -1);
            }
            int count = result.getIntValue(ResponseContant.count);
            return success((List) result.get(ResponseContant.resultMsg), count, page, size);
        }catch (Exception e){
            e.printStackTrace();
            return PageEnvelop.getError("查询失败");
        }
        int count = result.getIntValue(ResponseContant.count);
        return success((List) result.get(ResponseContant.resultMsg), count, page, size);
    }
@@ -106,7 +111,12 @@ public class WlyyDoorServiceOrderController extends EnvelopRestEndpoint {
    @ApiOperation(value = "查询单个咨询工单详情")
    public ObjEnvelop queryOneDetail(
            @ApiParam(name = "id", value = "工单id") @RequestParam(value = "id", required = true) String id) {
        return success(wlyyDoorServiceOrderService.queryOneDetail(id));
        try {
            return success(wlyyDoorServiceOrderService.queryOneDetail(id));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败");
        }
    }