Merge branch 'dev' of yeshijie/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionService.java

@@ -36,19 +36,19 @@ public class PrescriptionService extends BaseService {
        // "bcghcs":"本次挂号次数","ghksmc":"挂号科室名称","cfxms0":"明细上传数量","mzlsh0":"医保挂号流水号 如果为空，将自动医保挂号并收费","ghfy00":"挂号费用",
        // "yszjdj":"医师诊金级别","bqbm00":"病情编码","sfygwd":"是否医改网点"}
        json.put("yyksbm","医生科室编号");//医生科室编号
        json.put("bcsfcs",1);//本次收费次数
        json.put("bcsfcs",1+"");//本次收费次数
        json.put("yszjhm","医生证件号码");//医生证件号码
        json.put("ysxm00","医生姓名");//医生姓名
        json.put("mzlb00","门诊类别");//门诊类别
        json.put("sfydgh",1);//是否药店挂号
        json.put("bcghcs",1);//本次挂号次数
        json.put("sfydgh",1+"");//是否药店挂号
        json.put("bcghcs",1+"");//本次挂号次数
        json.put("ghksmc","挂号科室名称");//挂号科室名称
        json.put("cfxms0",1);//明细上传数量
        json.put("cfxms0",1+"");//明细上传数量
        json.put("mzlsh0","医保挂号流水号");//医保挂号流水号
        json.put("ghfy00",10);//挂号费用
        json.put("ghfy00",10+"");//挂号费用
        json.put("yszjdj","医师诊金级别");//医师诊金级别
        json.put("bqbm00","病情编码");//病情编码
        json.put("sfygwd",1);//是否医改网点
        json.put("sfygwd",1+"");//是否医改网点
        //诊断明细        {"zdms00":"诊断或症状描述","zdbh00":"诊断或症状编码"}
        JSONArray zdInfo = new JSONArray();
@@ -56,7 +56,7 @@ public class PrescriptionService extends BaseService {
        j1.put("zdms00","诊断或症状描述");//诊断或症状描述
        j1.put("zdbh00","诊断或症状编码");//诊断或症状编码
        zdInfo.put(j1);
        json.put("zdInfo",zdInfo);
        json.put("zdlist",zdInfo);
        //处方明细        {"xmgg00":"项目规格","cfhao0":"处方号","sfybxm":"是否医保项目","dcyydw":"单次用药单位","xmje00":"项目金额","xmbh00":"项目编号",
        // "ysxm00":"医生姓名","yppl00":"药品频率","gytj00":"给药途径","ypts00":"药品天数","xmdj00":"项目单价","qyzl00":"取药总量","ylts00":"药量天数",
@@ -66,18 +66,18 @@ public class PrescriptionService extends BaseService {
        JSONObject j2 = new JSONObject();
        j2.put("xmgg00","项目规格");//项目规格
        j2.put("cfhao0","处方号");//处方号
        j2.put("sfybxm",1);//是否医保项目
        j2.put("sfybxm",1+"");//是否医保项目
        j2.put("dcyydw","单次用药单位");//单次用药单位
        j2.put("xmje00",111);//项目金额
        j2.put("xmje00",111+"");//项目金额
        j2.put("xmje00","项目规格");//项目金额
        j2.put("xmbh00","项目编号");//项目编号
        j2.put("ysxm00","医生姓名");//医生姓名
        j2.put("yppl00","药品频率");//药品频率
        j2.put("gytj00","给药途径");//给药途径
        j2.put("ypts00",3);//药品天数
        j2.put("xmdj00",35);//项目单价
        j2.put("qyzl00",4);//取药总量
        j2.put("ylts00",3);//药量天数
        j2.put("ypts00",3+"");//药品天数
        j2.put("xmdj00",35+"");//项目单价
        j2.put("qyzl00",4+"");//取药总量
        j2.put("ylts00",3+"");//药量天数
        j2.put("sptxbm","商品条形编码");//商品条形编码
        j2.put("xmmc00","项目名称");//项目名称
        j2.put("fpxmbh","发票项目编号");//发票项目编号
@@ -88,7 +88,7 @@ public class PrescriptionService extends BaseService {
        j2.put("xmdw00","项目单位");//项目单位
        j2.put("jx0000","剂型");//剂型
        cfInfo.put(j2);
        json.put("zdInfo",cfInfo);
        json.put("mxlist",cfInfo);
        return json;
    }