Browse Source

医保相关

zhengwei 6 years ago
parent
commit
f8393af608

+ 1 - 1
src/main/java/com/yihu/quota/controller/MedicalInsuranceController.java

@ -63,7 +63,7 @@ public class MedicalInsuranceController extends BaseController {
            @ApiParam(name = "month", value = "月份", required = true)
            @ApiParam(name = "month", value = "月份", required = true)
            @RequestParam(value = "month" , required = true) String month,
            @RequestParam(value = "month" , required = true) String month,
            @ApiParam(name = "inspect", value = "检查类型", required = false)
            @ApiParam(name = "inspect", value = "检查类型", required = false)
            @RequestParam(value = "inspect" , required = true) String inspect,
            @RequestParam(value = "inspect" , required = false) String inspect,
            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
            @RequestParam(value = "size", required = false) int size,
            @RequestParam(value = "size", required = false) int size,
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @ApiParam(name = "page", value = "页码", defaultValue = "1")

+ 8 - 4
src/main/java/com/yihu/quota/service/medicalInsurance/MedicalInsuranceService.java

@ -130,7 +130,7 @@ public class MedicalInsuranceService {
                SolrDocumentList list = solrUtil.query(ResourceCore.MasterTable,q1,null,null,0,1,fields);
                SolrDocumentList list = solrUtil.query(ResourceCore.MasterTable,q1,null,null,0,1,fields);
                doc.putAll(list.get(0));
                doc.putAll(list.get(0));
                doc.put("address", null != list.get(0).get("EHR_001211") ? list.get(0).get("EHR_001211") : "");
                doc.put("address", null != list.get(0).get("EHR_001211") ? list.get(0).get("EHR_001211") : "");
                doc.put("event_date_real", doc.getFieldValue("event_date"));
                doc.put("event_date_real",  DateUtil.toString(new Date(doc.getFieldValue("event_date")+""),"yyyy-MM-dd'T'HH:mm:ss'Z'"));
                doc.put("event_date", DateUtil.toString(new Date(doc.getFieldValue("event_date")+"")));
                doc.put("event_date", DateUtil.toString(new Date(doc.getFieldValue("event_date")+"")));
            }
            }
        }
        }
@ -391,6 +391,10 @@ public class MedicalInsuranceService {
                mapInfo.put("patient_age", null != query.get(0).get("patient_age") ? query.get(0).get("patient_age") : "");
                mapInfo.put("patient_age", null != query.get(0).get("patient_age") ? query.get(0).get("patient_age") : "");
                mapInfo.put("patient_sex", sexExchangeByCode(sex));
                mapInfo.put("patient_sex", sexExchangeByCode(sex));
                mapInfo.put("address", null != query.get(0).get("EHR_001211") ? query.get(0).get("EHR_001211") : "");
                mapInfo.put("address", null != query.get(0).get("EHR_001211") ? query.get(0).get("EHR_001211") : "");
                String fq1 =  new StringBuffer().append("EHR_000017:").append(mapInfo.get("demographic_id")).append(" AND event_date:[").
                        append(start).append(" TO ").append(end).append("]").toString();
                int count = (int)solrUtil.count(ResourceCore.SubTable, "EHR_000333:"+mapInfo.get("inspectCode"),fq1);
                mapInfo.put("result",count);
            }
            }
        }
        }
        // 获取总记录数
        // 获取总记录数
@ -415,7 +419,7 @@ public class MedicalInsuranceService {
        boolean flag = false;
        boolean flag = false;
        for(Map<String,Object> map: list){
        for(Map<String,Object> map: list){
            if(idCard.equals(map.get("demographic_id"))&&inspectCode.equals(map.get("inspectCode"))){
            if(idCard.equals(map.get("demographic_id"))&&inspectCode.equals(map.get("inspectCode"))){
                map.put("result",Integer.parseInt(map.get("result")+"")+count);
                //map.put("result",Integer.parseInt(map.get("result")+"")+count);
                flag=true;
                flag=true;
                break;
                break;
            }
            }
@ -424,7 +428,7 @@ public class MedicalInsuranceService {
            Map<String,Object> resMap = new HashMap<>();
            Map<String,Object> resMap = new HashMap<>();
            resMap.put("demographic_id",idCard);
            resMap.put("demographic_id",idCard);
            resMap.put("inspectCode",inspectCode);
            resMap.put("inspectCode",inspectCode);
            resMap.put("result",count);
            //resMap.put("result",count);
            list.add(resMap);
            list.add(resMap);
        }
        }
    }
    }
@ -516,7 +520,7 @@ public class MedicalInsuranceService {
                SolrDocumentList list = solrUtil.query(ResourceCore.MasterTable,q1,null,null,0,1,fi1elds);
                SolrDocumentList list = solrUtil.query(ResourceCore.MasterTable,q1,null,null,0,1,fi1elds);
                doc.putAll(list.get(0));
                doc.putAll(list.get(0));
                doc.put("address", null != list.get(0).get("EHR_001211") ? list.get(0).get("EHR_001211") : "");
                doc.put("address", null != list.get(0).get("EHR_001211") ? list.get(0).get("EHR_001211") : "");
                doc.put("event_date_real", doc.getFieldValue("event_date"));
                doc.put("event_date_real",  DateUtil.toString(new Date(doc.getFieldValue("event_date")+""),"yyyy-MM-dd'T'HH:mm:ss'Z'"));
                doc.put("event_date", DateUtil.toString(new Date(doc.getFieldValue("event_date")+"")));
                doc.put("event_date", DateUtil.toString(new Date(doc.getFieldValue("event_date")+"")));
            }
            }
        }
        }