Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r16189 -r16192 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 16189) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 16192) @@ -81,6 +81,8 @@ private String settleAccountsDepart;// 结算科室 private String settleAccountsDepartCoding;// 结算科室部门编码 + + private String handleDepartId; // 处理科室id private String handleDepartCoding;// 处理科室部门编码 @@ -748,7 +750,15 @@ } return false; } + + public String getHandleDepartId() { + return handleDepartId; + } + public void setHandleDepartId(String handleDepartId) { + this.handleDepartId = handleDepartId; + } + public String getHandleDepartCoding() { return handleDepartCoding; } Index: forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java =================================================================== diff -u -r16188 -r16192 --- forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java (.../CssdServiceDepts.java) (revision 16188) +++ forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java (.../CssdServiceDepts.java) (revision 16192) @@ -31,6 +31,11 @@ private Long id; /** + * 供应室科室ID + */ + private Long cssdOrgUnitId; + + /** * 供应室科室编码 */ private String cssdOrgUnitCode; @@ -41,6 +46,11 @@ private String cssdOrgUnitName; /** + * 临床科室ID + */ + private Long clinicOrgUnitId; + + /** * 临床科室编码 */ private String clinicOrgUnitCode; @@ -84,7 +94,15 @@ public void setId(Long id) { this.id = id; } + + public Long getCssdOrgUnitId() { + return cssdOrgUnitId; + } + public void setCssdOrgUnitId(Long cssdOrgUnitId) { + this.cssdOrgUnitId = cssdOrgUnitId; + } + public String getCssdOrgUnitCode() { return cssdOrgUnitCode; } @@ -100,7 +118,15 @@ public void setCssdOrgUnitName(String cssdOrgUnitName) { this.cssdOrgUnitName = cssdOrgUnitName; } + + public Long getClinicOrgUnitId() { + return clinicOrgUnitId; + } + public void setClinicOrgUnitId(Long clinicOrgUnitId) { + this.clinicOrgUnitId = clinicOrgUnitId; + } + public String getClinicOrgUnitCode() { return clinicOrgUnitCode; } Index: forgon-core/src/main/java/com/forgon/directory/model/CssdHandleTousses.java =================================================================== diff -u -r16188 -r16192 --- forgon-core/src/main/java/com/forgon/directory/model/CssdHandleTousses.java (.../CssdHandleTousses.java) (revision 16188) +++ forgon-core/src/main/java/com/forgon/directory/model/CssdHandleTousses.java (.../CssdHandleTousses.java) (revision 16192) @@ -41,6 +41,11 @@ private String tousseName; /** + * 科室id + */ + private Long orgUnitId; + + /** * 科室编码 */ private String orgUnitCode; @@ -82,7 +87,15 @@ public void setTousseDefinitionId(Long tousseDefinitionId) { this.tousseDefinitionId = tousseDefinitionId; } + + public Long getOrgUnitId() { + return orgUnitId; + } + public void setOrgUnitId(Long orgUnitId) { + this.orgUnitId = orgUnitId; + } + public String getTousseName() { return tousseName; }