Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r32920 -r32925 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 32920) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 32925) @@ -2478,6 +2478,23 @@ curUseRecord.setDepartCodeOfpatient(departCodeOfpatient); modifyContent.add("病人所在科室由"+ originalDepartCodeOfpatient +"修改为"+ departCodeOfpatient); } + + //doctorAccountDepartCode主刀医生核算科室编码 + String originalDoctorAccountDepartCode = StringUtils.defaultString(original.getDoctorAccountDepartCode()); + String doctorAccountDepartCode = StringUtils.defaultString(modified.getDoctorAccountDepartCode()); + if (!StringUtils.equals(originalDoctorAccountDepartCode, doctorAccountDepartCode)) { + curUseRecord.setDoctorAccountDepartCode(doctorAccountDepartCode); + modifyContent.add("主刀医生核算科室编码由"+ originalDoctorAccountDepartCode +"修改为"+ doctorAccountDepartCode); + } + + //doctorAccountDepart 主刀医生核算科室名称 + String originalDoctorAccountDepart = StringUtils.defaultString(original.getDoctorAccountDepart()); + String doctorAccountDepart = StringUtils.defaultString(modified.getDoctorAccountDepart()); + if (!StringUtils.equals(originalDoctorAccountDepart, doctorAccountDepart)) { + curUseRecord.setDoctorAccountDepart(doctorAccountDepart); + modifyContent.add("主刀医生核算科室名称由"+ originalDoctorAccountDepart +"修改为"+ doctorAccountDepart); + } + //聚合包内的子包使用数据也需要复制到新的使用记录对象中 curUseRecord.setTousseInstanceList(modified.getTousseInstanceList()); curUseRecord.setSubComboTousseUseRecordList(modified.getSubComboTousseUseRecordList()); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java =================================================================== diff -u -r32847 -r32925 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java (.../UseRecord.java) (revision 32847) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java (.../UseRecord.java) (revision 32925) @@ -341,6 +341,16 @@ */ public static final String OPERATION_STATUS_END_OPERATION = "手术结束"; + /** + * 主刀医生核算科室ZYYFS-158 + */ + private String doctorAccountDepart; + + /** + * 主刀医生核算科室编码ZYYFS-158 + */ + private String doctorAccountDepartCode; + @Override @Id @GeneratedValue(strategy=GenerationType.AUTO) @@ -944,6 +954,8 @@ jsonObject.put("manualSetRecyclingStatusUser", getManualSetRecyclingStatusUser()); jsonObject.put("manualSetRecyclingStatusTime", getManualSetRecyclingStatusTime()); jsonObject.put("operationStatus", getOperationStatus()); + jsonObject.put("doctorAccountDepartCode", getDoctorAccountDepartCode()); + jsonObject.put("doctorAccountDepart", getDoctorAccountDepart()); if(CollectionUtils.isNotEmpty(tousseInstanceList)){ JSONArray array = new JSONArray(); @@ -1041,4 +1053,20 @@ this.dataSource = dataSource; } + public String getDoctorAccountDepart() { + return doctorAccountDepart; + } + + public void setDoctorAccountDepart(String doctorAccountDepart) { + this.doctorAccountDepart = doctorAccountDepart; + } + + public String getDoctorAccountDepartCode() { + return doctorAccountDepartCode; + } + + public void setDoctorAccountDepartCode(String doctorAccountDepartCode) { + this.doctorAccountDepartCode = doctorAccountDepartCode; + } + }