diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java index 03150269..d44f9371 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java @@ -106,5 +106,6 @@ public class CgdMainEntity implements Serializable { private Date wjTime; private String nuId; + private String sysOrgCode; private String izNew; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java index d0af7d04..f58eb3fa 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java @@ -154,6 +154,7 @@ public class NuInvoicingCgdMain implements Serializable { private String shareBy; private String shareTel; private String nuId; + private String sysOrgCode; /**是否已生成有效付款单 Y是 N否*/ private String izFkd; diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index c71fafe5..596834ab 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -291,6 +291,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl cgdInfoList = new ArrayList<>(); BigDecimal totalPrice = new BigDecimal(0); String qgdId = ""; @@ -1124,7 +1125,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl departList = sysBaseApi.queryDepartsByOrgcodes("101"); + List departList = sysBaseApi.queryDepartsByOrgcodes(cgdMain.getSysOrgCode()); if(departList.size()>0){ jgmc = departList.get(0).getString("departName"); jgdz = departList.get(0).getString("address");