Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/DsyyEntranceService.java

@@ -1271,7 +1271,7 @@ public class DsyyEntranceService {
     */
    public JSONArray getDrugFrequency() throws Exception {
        String sql = "SELECT\n" +
                "\tfreq_name AS \"FREQ_CODE\",\n" +
                "\tfreq_code AS \"FREQ_CODE\",\n" +
                "\tfreq_name AS \"FREQ_NAME\",\n" +
                "\tfreq_sp AS \"FREQ_SP\",\n" +
                "\tdaily_times AS \"DAILY_TIMES\",\n" +

business/base-service/src/main/java/com/yihu/jw/internet/service/InternetCommonService.java

@@ -1338,14 +1338,14 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
                jb.put("org_code",orgCode);
                jb.put("appr_drug_code", info.get("drug_no") == null? "0": info.get("drug_no"));
                jb.put("appr_drug_name", info.get("drug_name") == null? "0": info.get("drug_name"));
                jb.put("drug_code", info.get("drug_no") == null? "0": info.get("drug_no"));
                jb.put("drug_name", info.get("drug_name") == null? "0": info.get("drug_name"));
                jb.put("drug_code", "");
                jb.put("drug_name", "");
                jb.put("drug_form", "");
                jb.put("approval_no",info.get("serial"));
                jb.put("dosage",info.get("dosage") == null? 0: info.get("dosage"));
                jb.put("Prescription days",Integer.parseInt(info.get("days").toString()));
                jb.put("dosage_unit", info.get("unit") == null? "0": info.get("unit"));
                jb.put("total_dosage", info.get("quantity") == null? 0: info.get("quantity"));
                jb.put("total_dosage", info.get("quantity") == null? 0: Integer.parseInt(info.get("quantity").toString()));
                jb.put("total_dosage_unit", info.get("pack_unit") == null? "0": info.get("pack_unit"));
                jb.put("medicine_freq", info.get("usage_code") == null? "0": info.get("usage_code"));
                jb.put("drug_use", info.get("supply_code") == null? "0": info.get("supply_code"));
@@ -1356,7 +1356,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
                DecimalFormat decimalFormat = new DecimalFormat("0.00");
                Double price = pack_retprice.doubleValue()*quantity;
                logger.info("price"+decimalFormat.format(price));
                jb.put("drug_total_price",decimalFormat.format(price));
                jb.put("drug_total_price",Double.parseDouble(decimalFormat.format(price)));
                jb.put("comments", "");
                jb.put("anti_comments", "");
                jb.put("dec_meth_name", "");
@@ -1370,6 +1370,35 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
            if(!errorFlag){
                JSONArray jsonArray = new JSONArray();
                jsonArray.add(jb);
               /* JSONArray jsonArray = new JSONArray();*/
//        for(int i=0;i<10;i++){
              /*  JSONObject jb1 = new JSONObject();
                jb1.put("id_prescription_drug", "5b64049350ffad3easdadasda");
                jb1.put("org_code", "123501004880997000");
                jb1.put("pres_no", "123");
                jb1.put("approval_no", "123");
                jb1.put("cuntry_drug_code", "123");
                jb1.put("elet_drug_code", "123");
                //jb.put("prescription_days", 1);
                jb1.put("Prescription days", "2");
                jb1.put("appr_drug_code", "1");
                jb1.put("appr_drug_name", "达福玲" );
                jb1.put("drug_code", "002");
                jb1.put("drug_name", "慢性");
                jb1.put("drug_form", "袋");
                jb1.put("dosage", 2.012);
                jb1.put("dosage_unit", "1");
                jb1.put("total_dosage",1.001);
                jb1.put("total_dosage_unit", "7");
                jb1.put("medicine_freq", "5");
                jb1.put("drug_use", "口服");
                jb1.put("standard_desc", "10");
                jb1.put("single_price", 12.12);
                jb1.put("drug_total_price", 14);
                jb1.put("comments", "饭后");
                jb1.put("anti_comments", "无");
                jb.put("dec_meth_name", "无");
                jsonArray.add(jb);*/
                res = postToInter(token,api, jsonArray,url);
                JSONObject resJson = (JSONObject) JSONObject.parse(res);