|
@@ -566,7 +566,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
|
Long qcTypeId = Long.valueOf("0");
|
|
|
String behDeptId = behospitalInfo.getBehDeptId();
|
|
|
String recTypeId = medicalRecord.getRecTypeId();
|
|
|
- if (recTypeId.contains("RJBL") || recTypeId.contains("24XSCRYJL") || recTypeId.contains("24XSCRYJL1")) {
|
|
|
+ if (recTypeId.contains("RJBL") || recTypeId.contains("24XSCRYJL")) {
|
|
|
if (behDeptId.equals("52425")) {
|
|
|
/**妇科(住)日间病历、24小时出入院记录的病历模板,映射妇科日间*/
|
|
|
behDeptId = "52883";
|
|
@@ -582,24 +582,22 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
|
.eq("beh_dept_id", behDeptId)
|
|
|
.eq("hospital_id", behospitalInfo.getHospitalId())
|
|
|
.eq("is_deleted", IsDeleteEnum.N));
|
|
|
- if (medicalRecord != null) {
|
|
|
- if (qcTypeList.size() == 0) {
|
|
|
- QcType qcType = qcTypeFacade.getOne(new QueryWrapper<QcType>()
|
|
|
- .eq("default_module", 1)
|
|
|
- .eq("hospital_id", behospitalInfo.getHospitalId())
|
|
|
- .eq("is_deleted", IsDeleteEnum.N));
|
|
|
- qcTypeId = qcType.getId();
|
|
|
- } else if (qcTypeList.size() == 1) {
|
|
|
- qcTypeId = qcTypeList.get(0).getId();
|
|
|
- } else {
|
|
|
- QcType qcType = new QcType();
|
|
|
- qcTypeList.forEach(ss -> {
|
|
|
- if (ss.getSex().equals(behospitalInfo.getSex())) {
|
|
|
- qcType.setId(ss.getId());
|
|
|
- }
|
|
|
- });
|
|
|
- qcTypeId = qcType.getId();
|
|
|
- }
|
|
|
+ if (qcTypeList.size() == 0) {
|
|
|
+ QcType qcType = qcTypeFacade.getOne(new QueryWrapper<QcType>()
|
|
|
+ .eq("default_module", 1)
|
|
|
+ .eq("hospital_id", behospitalInfo.getHospitalId())
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N));
|
|
|
+ qcTypeId = qcType.getId();
|
|
|
+ } else if (qcTypeList.size() == 1) {
|
|
|
+ qcTypeId = qcTypeList.get(0).getId();
|
|
|
+ } else {
|
|
|
+ QcType qcType = new QcType();
|
|
|
+ qcTypeList.forEach(ss -> {
|
|
|
+ if (ss.getSex().equals(behospitalInfo.getSex())) {
|
|
|
+ qcType.setId(ss.getId());
|
|
|
+ }
|
|
|
+ });
|
|
|
+ qcTypeId = qcType.getId();
|
|
|
}
|
|
|
return qcTypeId;
|
|
|
}
|