|
@@ -1,5 +1,6 @@
|
|
|
package thyyxxk.webserver.service.zhuyuanyisheng;
|
|
|
|
|
|
+import cn.hutool.core.date.DatePattern;
|
|
|
import cn.hutool.core.util.ReflectUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
@@ -34,6 +35,7 @@ import thyyxxk.webserver.utils.*;
|
|
|
|
|
|
import java.lang.reflect.Field;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.text.DateFormat;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -227,6 +229,8 @@ public class JianYanJianChaShenQingService {
|
|
|
.responceTypeName(patient.getResponceTypeName())
|
|
|
.reqDept(req.getReqDeptName())
|
|
|
.reqDoctor(req.getReqDoctorName())
|
|
|
+ .reqDate(DateUtil.format(req.getReqDate(), DatePattern.NORM_DATETIME_MINUTE_PATTERN))
|
|
|
+ .reqWard(req.getReqWardName())
|
|
|
.build();
|
|
|
}
|
|
|
|
|
@@ -613,7 +617,8 @@ public class JianYanJianChaShenQingService {
|
|
|
param.getAdmissTimes(),
|
|
|
param.getBedNo(),
|
|
|
userCode,
|
|
|
- patInfo.getDeptCode(),
|
|
|
+ // 这里是坑爹的反过来的
|
|
|
+ patInfo.getWardCode(),
|
|
|
patInfo.getDeptCode(),
|
|
|
param.getReqType(),
|
|
|
"3".equals(param.getReqType()) ? "jc_zd_item" : "jy_zd_item",
|