11

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedOrderService.java

@@ -586,6 +586,9 @@ public class MedOrderService {
                    feedetailTmp.put("bilg_dr_name",tmp.getBilgDrName()); //开单医师姓名
                    feedetailTmp.put("hosp_appr_flag",tmp.getHospApprFlag()); //医院审批标志
                    feedetailTmp.put("rxno",tmp.getRxno()); //单据号
                    JSONObject exp_content  = new JSONObject();
                    exp_content.put("prcunt",tmp.getChargeUnitName());
                    feedetailTmp.put("exp_content",exp_content.toJSONString());
                    feedetail.add(feedetailTmp);
                }
                JSONObject presinfo = new JSONObject();//结算处方信息

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@@ -784,6 +784,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                "                t.price AS price,\n" +
                "                t.specif AS specif,\n" +
                "                t.unit AS unit,\n" +
                "                t.quantity_unit AS quantityUnit,\n" +
                "                t.pack_unit AS packUnit,\n" +
                "                t.org_code AS orgCode,\n" +
                "                t.org_name AS orgName,\n" +
                "                t.equ_name AS equName,\n" +
@@ -1771,6 +1773,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    "\tt.price AS price,\n" +
                    "\tt.specif AS specif,\n" +
                    "\tt.unit AS unit,\n" +
                    "\tt.quantity_unit AS quantityUnit,\n" +
                    "\tt.pack_unit AS packUnit,\n" +
                    "\tt.org_code AS orgCode,\n" +
                    "\tt.org_name AS orgName,\n" +
                    "                t.equ_name AS equName,\n" +
@@ -2211,6 +2215,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                        "\tt.price AS price,\n" +
                        "\tt.specif AS specif,\n" +
                        "\tt.unit AS unit,\n" +
                        "\tt.quantity_unit AS quantityUnit,\n" +
                        "\tt.pack_unit AS packUnit,\n" +
                        "\tt.org_code AS orgCode,\n" +
                        "\tt.org_name AS orgName,\n" +
                        "                t.equ_name AS equName,\n" +