心脏修改

business/base-service/src/main/java/com/yihu/jw/hospital/httplog/service/BaseOperateLogService.java

@@ -38,7 +38,7 @@ public class BaseOperateLogService extends BaseJpaService<BaseOperateLogDO, Base
        BaseOperateLogDO baseOperateLogDO=new BaseOperateLogDO();
        BaseDoctorDO baseDoctorDO=baseDoctorDao.findById(operator);
        baseOperateLogDO.setOperator(operator);
        baseOperateLogDO.setPatientName(patient);
        baseOperateLogDO.setPatient(patient);
        baseOperateLogDO.setCode(code);
        baseOperateLogDO.setName(name);
        baseOperateLogDO.setRelationType(relationType);

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/httplog/BaseOperateLogDO.java

@@ -9,7 +9,7 @@ import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "wlyy_http_log")
@Table(name = "base_operate_log")
public class BaseOperateLogDO extends UuidIdentityEntity {
    private String code;
    private String name;

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/httplog/WlyyHttpLogDO.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.hospital.httplog;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@@ -80,6 +81,7 @@ public class WlyyHttpLogDO extends UuidIdentityEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name="create_time")
    public Date getCreateTime() {
        return createTime;
    }

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

@@ -19,6 +19,7 @@ import com.yihu.jw.entity.base.im.ConsultDo;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.prescription.*;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.hospital.httplog.service.BaseOperateLogService;
import com.yihu.jw.hospital.mapping.service.PatientMappingService;
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionDiagnosisDao;
@@ -129,6 +130,8 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    private TnPrescriptionService tnPrescriptionService;
    @Autowired
    private EntranceService entranceService;
    @Autowired
    private BaseOperateLogService baseOperateLogService;
    @Value("${qywx.id}")
    private String qywxId;
@@ -3049,6 +3052,29 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping("/findOperateLogs")
    @ApiOperation(value = "查询操作日志")
    public Envelop findOperateLogs( @ApiParam(name = "code", value = "code")
                                     @RequestParam(value = "code",required = false)String code,
                                    @ApiParam(name = "name", value = "name")
                                    @RequestParam(value = "name",required = false)String name,
                                    @ApiParam(name = "patientName", value = "patientName")
                                        @RequestParam(value = "patientName",required = false)String patientName,
                                    @ApiParam(name = "doctorName", value = "doctorName")
                                        @RequestParam(value = "doctorName",required = false)String doctorName,
                                    @ApiParam(name = "startTime", value = "startTime")
                                        @RequestParam(value = "startTime",required = false)String startTime,
                                    @ApiParam(name = "endTime", value = "endTime")
                                        @RequestParam(value = "endTime",required = false)String endTime,
                                    @ApiParam(name = "page", value = "page")
                                        @RequestParam(value = "page",required = false)Integer page,
                                    @ApiParam(name = "pageSize", value = "pageSize")
                                        @RequestParam(value = "pageSize",required = false)Integer pageSize) throws Exception {
        try {
            return success(baseOperateLogService.findOperateLogList(code,name,patientName,doctorName,startTime,endTime,page,pageSize));
        } catch (Exception e) {
            return Envelop.getError(e.getMessage());
        }
    }
}