医保结算

business/base-service/src/main/java/com/yihu/jw/healthCare/service/HealthCareNewService.java

@@ -2293,7 +2293,7 @@ public class HealthCareNewService {
    }
    public Boolean isHospitalFlag(){
        WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("medicalFlagTest");
        WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("medicalFlag");
        if (hospitalSysDictDO!=null){
            if (hospitalSysDictDO.getDictValue().equalsIgnoreCase("1")){
                return true;

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

@@ -3914,7 +3914,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            WritableSheet ws;
            ws = wwb.createSheet("sheet", 1);
            String[] header = {"序号","充值时间","商户订单号","医院订单号","患者姓名","证件号码","就诊卡号","手机号码","自费金额","医保金额","状态","业务类型","咨询方式","代问诊人","问诊医生"};
            String[] header = {"序号","充值时间","商户订单号","医院订单号","患者姓名","证件号码","就诊卡号","手机号码","自费金额","医保金额","状态","业务类型","咨询方式","代问诊人","问诊医生","个人现金支付金额(实付现金)","个人账户支付金额",
            "医保基金支付总额","统筹基金支付","商保基金支付(大额补充)","公务员医疗补助","精准扶贫医疗叠加","医疗救助基金","其他基金支付","企业补充","家庭共济账户支付"};
            int k = 0;
            for (String h : header) {
                addCell(ws, 0, k, h);//表名，行，列，header
@@ -4039,6 +4040,17 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                addCell(ws, i, 12, odte!=null?odte:n);
                addCell(ws, i, 13, (String) m.get("patientName")!=null?(String) m.get("patientName"):n);
                addCell(ws, i, 14, doctorName!=null?doctorName:n);
                addCell(ws, i, 15, (String) m.get("personCash")!=null?(String) m.get("personCash"):n);
                addCell(ws, i, 16, (String) m.get("personAccount")!=null?(String) m.get("personAccount"):n);
                addCell(ws, i, 17, (String) m.get("fundPrice")!=null?(String) m.get("fundPrice"):n);
                addCell(ws, i, 18, (String) m.get("tcjjPay")!=null?(String) m.get("tcjjPay"):n);
                addCell(ws, i, 19, (String) m.get("sbjjPay")!=null?(String) m.get("sbjjPay"):n);
                addCell(ws, i, 20, (String) m.get("gwyPay")!=null?(String) m.get("gwyPay"):n);
                addCell(ws, i, 21, (String) m.get("jzfpPay")!=null?(String) m.get("jzfpPay"):n);
                addCell(ws, i, 22, (String) m.get("yljzPay")!=null?(String) m.get("yljzPay"):n);
                addCell(ws, i, 23, (String) m.get("otherPay")!=null?(String) m.get("otherPay"):n);
                addCell(ws, i, 24, (String) m.get("enterpriseSupplement")!=null?(String) m.get("enterpriseSupplement"):n);
                addCell(ws, i, 25, (String) m.get("jtgjPay")!=null?(String) m.get("jtgjPay"):n);
                i++;
            }
            wwb.write();

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -2698,7 +2698,16 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                " case t.order_category when '2' then '2' when '3' then '2' else t.order_category end  as \"orderCategory\", "+
                "ymr.person_cash as \"personCash\",\n" +
                "ymr.person_account as \"personAccount\",\n" +
                "ymr.medical_price as \"medicalPrice\" "+
                "ymr.medical_price as \"medicalPrice\", "+
                "ymr.fund_price as \"fundPrice\", "+
                "ymr.tcjj_pay as \"tcjjPay\" , "+
                "ymr.sbjj_pay as \"sbjjPay\" , "+
                "ymr.gwy_pay as \"gwyPay\" , "+
                "ymr.jzfp_pay as \"jzfpPay\" , "+
                "ymr.yljz_pay as \"yljzPay\" , "+
                "ymr.other_pay as \"otherPay\" , "+
                "ymr.enterprise_supplement as \"enterpriseSupplement\" , "+
                "ymr.jtgj_pay as \"jtgjPay\" "+
                " from base_business_order_pay t" +
                " left join base_patient b on t.patient = b.id" +
                " left join base_ylz_medical_relation ymr on ymr.id=t.relation_code "+
@@ -2760,35 +2769,39 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
        for (Map<String,Object> map:list){
            if (map.get("orderCategory")!=null){
                String orderCategoryFlag = map.get("orderCategory").toString();
                String relationCode =map.get("relationCode").toString();
                if (!orderCategoryFlag.equalsIgnoreCase("5")){
                    Double price = Double.parseDouble(map.get("payPrice").toString());
                    Double prie = price/100;
                    logger.info("price"+prie);
                    map.put("payPrice",prie);
                    map.put("medicalPrice",0);
                }if (orderCategoryFlag.equalsIgnoreCase("1")||orderCategoryFlag.equalsIgnoreCase("2")||orderCategoryFlag.equalsIgnoreCase("3")){
                    WlyyOutpatientDO outpatientDO = outpatientDao.findById(relationCode);
                    map.put("doctorName",outpatientDO.getDoctorName());
                    map.put("consumerName",outpatientDO.getConsumerName());
                    map.put("patientName",outpatientDO.getPatientName());
                    map.put("medicalPrice",0);
                }else if (orderCategoryFlag.equalsIgnoreCase("4")){
                    WlyyPrescriptionDO prescriptionDO = prescriptionDao.findOne(relationCode);
                    WlyyOutpatientDO outpatientDO = outpatientDao.findById(prescriptionDO.getOutpatientId());
                    map.put("doctorName",outpatientDO.getDoctorName());
                    map.put("consumerName",outpatientDO.getConsumerName());
                    map.put("patientName",outpatientDO.getPatientName());
                    map.put("medicalPrice",0);
                }else if (orderCategoryFlag.equalsIgnoreCase("6")){
                    YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findOne(relationCode);
                    WlyyOutpatientDO outpatientDO = outpatientDao.findById(ylzMedicalRelationDO.getRelationCode());
                    Double personAccount = Double.parseDouble(map.get("personAccount").toString());
                    Double medicalPrice = Double.parseDouble(map.get("medicalPrice").toString());
                    map.put("medicalPrice",medicalPrice+personAccount);
                    map.put("doctorName",outpatientDO.getDoctorName());
                    map.put("consumerName",outpatientDO.getConsumerName());
                    map.put("patientName",outpatientDO.getPatientName());
                if (map.get("relationCode")!=null){
                    String relationCode =map.get("relationCode").toString();
                    if (!orderCategoryFlag.equalsIgnoreCase("5")){
                        Double price = Double.parseDouble(map.get("payPrice").toString());
                        Double prie = price/100;
                        logger.info("price"+prie);
                        map.put("payPrice",prie);
                        map.put("medicalPrice",0);
                    }if (orderCategoryFlag.equalsIgnoreCase("1")||orderCategoryFlag.equalsIgnoreCase("2")||orderCategoryFlag.equalsIgnoreCase("3")){
                        WlyyOutpatientDO outpatientDO = outpatientDao.findById(relationCode);
                        map.put("doctorName",outpatientDO.getDoctorName());
                        map.put("consumerName",outpatientDO.getConsumerName());
                        map.put("patientName",outpatientDO.getPatientName());
                        map.put("medicalPrice",0);
                    }else if (orderCategoryFlag.equalsIgnoreCase("4")){
                        WlyyPrescriptionDO prescriptionDO = prescriptionDao.findOne(relationCode);
                        if (prescriptionDO!=null){
                            WlyyOutpatientDO outpatientDO = outpatientDao.findById(prescriptionDO.getOutpatientId());
                            map.put("doctorName",outpatientDO.getDoctorName());
                            map.put("consumerName",outpatientDO.getConsumerName());
                            map.put("patientName",outpatientDO.getPatientName());
                            map.put("medicalPrice",0);
                        }
                    }else if (orderCategoryFlag.equalsIgnoreCase("6")){
                        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findOne(relationCode);
                        WlyyOutpatientDO outpatientDO = outpatientDao.findById(ylzMedicalRelationDO.getRelationCode());
                        Double personAccount = Double.parseDouble(map.get("personAccount").toString());
                        Double medicalPrice = Double.parseDouble(map.get("medicalPrice").toString());
                        map.put("medicalPrice",medicalPrice+personAccount);
                        map.put("doctorName",outpatientDO.getDoctorName());
                        map.put("consumerName",outpatientDO.getConsumerName());
                        map.put("patientName",outpatientDO.getPatientName());
                    }
                }
            }
        }
@@ -2834,7 +2847,16 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                "\tt.order_category AS \"orderCategory\",\n" +
                "ymr.person_cash as \"personCash\",\n" +
                "ymr.person_account as \"personAccount\",\n" +
                "ymr.medical_price as \"medicalPrice\" "+
                "ymr.medical_price as \"medicalPrice\" , "+
                "ymr.fund_price as \"fundPrice\", "+
                "ymr.tcjj_pay as \"tcjjPay\" , "+
                "ymr.sbjj_pay as \"sbjjPay\" , "+
                "ymr.gwy_pay as \"gwyPay\" , "+
                "ymr.jzfp_pay as \"jzfpPay\" , "+
                "ymr.yljz_pay as \"yljzPay\" , "+
                "ymr.other_pay as \"otherPay\" , "+
                "ymr.enterprise_supplement as \"enterpriseSupplement\" , "+
                "ymr.jtgj_pay as \"jtgjPay\" "+
                "FROM\n" +
                "\tbase_business_order_pay t\n" +
                "LEFT JOIN base_patient b ON t.patient = b.id\n" +

svr/svr-internet-hospital/pom.xml

@@ -11,7 +11,7 @@
    </parent>
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-internet-hospital-test</artifactId>
    <artifactId>svr-internet-hospital</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
@@ -268,7 +268,7 @@
    </dependencies>
    <build>
        <finalName>svr-internet-hospital-test</finalName>
        <finalName>svr-internet-hospital</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>