chenjiasheng 3 jaren geleden
bovenliggende
commit
c69634fc9e

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

@ -82,15 +82,15 @@ public class MedOrderService {
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setPickUpNum(order);
            mediicineorder.setAmount(params.getString("orderAmount"));
            mediicineorder.setSocialSecurityCardNum(params.getString("securityCardNum"));
            mediicineorder.setSocialSecurityCardNum(params.getString("SecurityCardNum"));
            mediicineorder.setSocialinsurPayment(params.getString("socialinsurPayment"));
            mediicineorder.setOrderAmount(params.getString("orderAmount"));
            mediicineorder.setPayTime(params.getDate("payTime"));
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
            List<Mediicineorderdetail> mediicineorderdetailList=new ArrayList<>();
            Mediicineorderdetail mediicineorderdetail=new Mediicineorderdetail();
            for (int i = 0; i <jsonArray.size() ; i++) {
                Mediicineorderdetail mediicineorderdetail=new Mediicineorderdetail();
                JSONObject jsonObject=jsonArray.getJSONObject(i);
                mediicineorderdetail.setId(jsonObject.getString("drug_id"));
                mediicineorderdetail.setDrugSku(jsonObject.getString("drug_sku "));

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

@ -1483,38 +1483,59 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    }
    public MixEnvelop getSumAmount(String belongCommunity, String equNum, String startTime, String endTime) {
        List<Map<String,Object>> arrayList=new ArrayList<>();
        List<Map<String,Object>> mapList=new ArrayList<>();
        Map<String,Object> map = new HashMap<>();
        //查询出所有的设备
        Iterable <Mediicinedevice> mediicinedevices = deviceDao.findAll();
        List<Mediicinedevice> mediicinedeviceList= IterableUtils.toList(mediicinedevices);
        Map<String,Object> map=new HashMap<>();
        //将同一个设备的社区/名称/设备编码/历史记录/总金额放到一个Map中
        for (Mediicinedevice mediicinedevice:mediicinedeviceList){
            String sql = "SELECT SUM(t.amount) AS sumAmount,\n" +
                    "COUNT(*) AS count,\n" +
                    "t.shipping_equ AS equNum \n" +
                    "FROM t_mediicine_order AS t,\n" +
                    "t_mediicine_device AS a \n" +
                    "WHERE t.shipping_equ = a.equ_num AND t.sell_state = 1 " +
                    "AND 1=1";
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)){
                sql += "AND a.belong_community ='"+belongCommunity+"'";
            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
                sql += "AND t.shipping_equ = '" + equNum + "'";
            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)){
                sql += "AND t.shipping_time >= "+ startTime  ;
            map.put("社区",mediicinedevice.getCommunity());
            map.put("设备编号",mediicinedevice.getEquNum()+"/"+mediicinedevice.getEquName());
            String oneSql="SELECT SUM(t.amount) AS sumAmount,\n" +
                    "                COUNT(*) AS count,\n" +
                    "                t.shipping_equ AS equNum\n" +
                    "                FROM t_mediicine_order  t WHERE t.sell_state = 1 AND t.shipping_equ = '" + mediicinedevice.getEquNum()+"'";
            List<Map<String,Object>> list = hibenateUtils.createSQLQuery(oneSql);
            for (Map<String,Object> oneMap:list){
                String count = oneMap.get("count")==null?"0":oneMap.get("count").toString();
                String sumAmount=oneMap.get("sumAmount")==null?"0":oneMap.get("sumAmount").toString();
                map.put("count",count);
                map.put("sumAmount",sumAmount);
            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)){
                sql += "AND t.shipping_time <= "+ endTime ;
            }
//        sql += "GROUP BY t.shipping_equ";
            sql +="AND t.shipping_equ = '" + mediicinedevice.getEquNum()+"'";
            Map<String,Object> result=new HashMap<>();
            List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
            result.put("msg",list);
            mapList.add(result);
        }
        String sql = "SELECT SUM(t.amount) AS sumAmount,\n" +
                "a.community AS community,\n" +
                "a.equ_name AS equName,\n" +
                "COUNT(*) AS count,\n" +
                "t.shipping_equ AS equNum \n" +
                "FROM t_mediicine_order AS t,\n" +
                "t_mediicine_device AS a \n" +
                "WHERE t.shipping_equ = a.equ_num AND t.sell_state = 1 " +
                "AND 1=1";
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)){
            sql += "AND a.belong_community ='"+belongCommunity+"'";
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
            sql += "AND t.shipping_equ = '" + equNum + "'";
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)){
            sql += "AND t.shipping_time >= "+ startTime  ;
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)){
            sql += "AND t.shipping_time <= "+ endTime ;
        }
        for (Mediicinedevice mediicinedevice:mediicinedeviceList){
        }
        Map<String,Object> result=new HashMap<>();
        List<Map<String,Object>> mapList=new ArrayList<>();
        sql += "GROUP BY t.shipping_equ";
        sql +="AND t.shipping_equ = '" + equNum+"'";
        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
        result.put("msg",list);
        mapList.add(result);
        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,mapList);
    }

+ 5 - 3
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/med/MedOrderService.java

@ -79,21 +79,23 @@ public class MedOrderService {
            mediicineorder.setDeptName(params.getString("rx_doctor_name"));
            mediicineorder.setDoctorAdvice(params.getString("rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setPickUpNum(mediicineorder.getPrescribeNum());
            mediicineorder.setPickUpNum(order);
            mediicineorder.setAmount(params.getString("orderAmount"));
            mediicineorder.setSocialSecurityCardNum(params.getString("SecurityCardNum"));
            mediicineorder.setSocialinsurPayment(params.getString("socialinsurPayment"));
            mediicineorder.setAmount(params.getString("orderAmount"));
            mediicineorder.setOrderAmount(params.getString("orderAmount"));
            mediicineorder.setPayTime(params.getDate("payTime"));
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
            List<Mediicineorderdetail> mediicineorderdetailList=new ArrayList<>();
            Mediicineorderdetail mediicineorderdetail=new Mediicineorderdetail();
            for (int i = 0; i <jsonArray.size() ; i++) {
                Mediicineorderdetail mediicineorderdetail=new Mediicineorderdetail();
                JSONObject jsonObject=jsonArray.getJSONObject(i);
                mediicineorderdetail.setId(jsonObject.getString("drug_id"));
                mediicineorderdetail.setDrugSku(jsonObject.getString("drug_sku "));
                mediicineorderdetail.setDrugCode(jsonObject.getString("drug_code"));
                mediicineorderdetail.setSpecif(jsonObject.getString("drug_specs"));
                mediicineorderdetail.setDrugNum(jsonObject.getString("drug_num"));
                mediicineorderdetail.setQuantity(jsonObject.getString("drug_num"));
                mediicineorderdetail.setPrice(jsonObject.getFloat("drug_price"));
                mediicineorderdetail.setUseNum(jsonObject.getString("drug_use_num"));