Merge branch 'medicare' of liubing/wlyy2.0 into medicare

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/MedicineShipmentLog.java

@@ -107,6 +107,8 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
    private String useRate;
    private String useRateCode;
    private String useDose;
    private String quantityUnit;//每次用量单位
    private String packUnit;//包装数量单位
    public MedicineShipmentLog() {
    }
@@ -303,4 +305,20 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
    public void setUseDose(String useDose) {
        this.useDose = useDose;
    }
    public String getQuantityUnit() {
        return quantityUnit;
    }
    public void setQuantityUnit(String quantityUnit) {
        this.quantityUnit = quantityUnit;
    }
    public String getPackUnit() {
        return packUnit;
    }
    public void setPackUnit(String packUnit) {
        this.packUnit = packUnit;
    }
}

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" +
@@ -2363,6 +2369,12 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                            shipmentLog.setPrice(mediicinedrugs.getPrice());
                            shipmentLog.setSpecif(mediicinedrugs.getSpecif());
                            shipmentLog.setUnit(mediicinedrugs.getUnit());
                            String drugSql = " select quantity_unit,pack_unit from t_mediicine_drugs where org_code='"+mediicinedrugs.getOrgCode()+"' and drug_code='"+mediicinedrugs.getDrugCode()+"' ";
                            List<Map<String,Object>> drugTmps = jdbcTemplate.queryForList(drugSql);
                            if (drugTmps.size()>0){
                                shipmentLog.setPackUnit(drugTmps.get(0).get("pack_unit")==null?"":drugTmps.get(0).get("pack_unit").toString());
                                shipmentLog.setQuantityUnit(drugTmps.get(0).get("quantity_unit")==null?"":drugTmps.get(0).get("quantity_unit").toString());
                            }
                            shipmentLog.setEquName(mediicinedevice.getEquName());
                            shipmentLog.setEquNum(mediicinedevice.getEquNum());
                            shipmentLog.setDosForm(mediicinedrugs.getDosForm());

svr/svr-base/src/main/resources/application.yml

@@ -839,4 +839,4 @@ im:
  im_list_get: http://127.0.0.1:3000/
medicine:
  socketUrl: http://10.95.22.10:9660/cabinet/websocket/upws/send
  socketUrl: http://127.0.0.1:10035/upws/send