提交 05e853f6 authored 作者: luzhangjian's avatar luzhangjian

feat:修正错误

上级 031a54cf
...@@ -31,6 +31,9 @@ public class OrderListReqDTO extends PageDTO { ...@@ -31,6 +31,9 @@ public class OrderListReqDTO extends PageDTO {
@ApiModelProperty("科室名称") @ApiModelProperty("科室名称")
private String deptName; private String deptName;
@ApiModelProperty("科室id")
private Long deptId;
@ApiModelProperty("1订单开始时间/2订单结束时间") @ApiModelProperty("1订单开始时间/2订单结束时间")
private Integer timeType; private Integer timeType;
......
...@@ -303,7 +303,7 @@ public class PatientMedicalRecordServiceImpl implements PatientMedicalRecordServ ...@@ -303,7 +303,7 @@ public class PatientMedicalRecordServiceImpl implements PatientMedicalRecordServ
message.setAdmissionId(admissionInfo.getAdmId()); message.setAdmissionId(admissionInfo.getAdmId());
message.setApplicationCode(IMInformConstants.IM_SYSTEM_BUSINESS_CODE); message.setApplicationCode(IMInformConstants.IM_SYSTEM_BUSINESS_CODE);
message.setData(content); message.setData(content);
message.setMsgContent(JSON.toJSONString(message)); // message.setMsgContent(JSON.toJSONString(message));
messageInfo.setSingleAccount(newAccount(IMInformConstants.PATIENT_APPLICATION_CODE, patientUserId)); messageInfo.setSingleAccount(newAccount(IMInformConstants.PATIENT_APPLICATION_CODE, patientUserId));
messageInfo.setSelfAccount(newAccount(IMInformConstants.DOCTOR_APPLICATION_CODE, admissionInfo.getDoctorUserId())); messageInfo.setSelfAccount(newAccount(IMInformConstants.DOCTOR_APPLICATION_CODE, admissionInfo.getDoctorUserId()));
messageInfo.setMessage(message); messageInfo.setMessage(message);
......
...@@ -46,6 +46,9 @@ ...@@ -46,6 +46,9 @@
<if test="deptName!=null and deptName!=''"> <if test="deptName!=null and deptName!=''">
and dept_name like concat('%',#{deptName},'%') and dept_name like concat('%',#{deptName},'%')
</if> </if>
<if test="deptId!=null and deptId!=''">
and dept_id = #{deptId}
</if>
<if test="timeType!=null and timeType!=''"> <if test="timeType!=null and timeType!=''">
<if test="timeType == 1"> <if test="timeType == 1">
and create_time BETWEEN #{startTime} AND #{endTime} and create_time BETWEEN #{startTime} AND #{endTime}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论