Browse Source

微信公众号二维码查询生成

wangjun 4 years ago
parent
commit
b6fe90c131

+ 38 - 26
business/base-service/src/main/java/com/yihu/jw/hospital/family/service/WlyyFamilyMemberService.java

@ -52,6 +52,8 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
    //添加关联家属
    @Transactional
    public MixEnvelop addFamily(String id,String patientId, String familyName, String dictId, String cardType, String idCard, String phoneNum,boolean demo) throws Exception {
        MixEnvelop mixEnvelop = new MixEnvelop();
        try{
        BasePatientMemberDictDO basePatientMemberDictDO = basePatientMemberDictDao.findOne(dictId);
        BasePatientDO basePatientDO = basePatientDao.findByIdcard(idCard);
        Map<String,Object> resultMap = new HashMap<>();
@ -66,7 +68,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
        if (StringUtils.isNotBlank(id)){
            result = wlyyPatientFamilyMemberDao.findOne(id);
        }
        MixEnvelop mixEnvelop = new MixEnvelop();
        String dictName = "";
        if (null!=basePatientMemberDictDO){
            dictName = basePatientMemberDictDO.getRelationName();
@ -89,6 +91,10 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                    }
                    familyId= jsonObject.getString("brid");
                    birth= jsonObject.getString("csny");
                    long lt = new Long(birth);
                    SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
                    birth = sf.format(lt);
                    System.out.println("眼科转换后的csny"+birth);
                }else {
                    mixEnvelop.setStatus(408);
                    mixEnvelop.setMessage("您所添加的家属无就诊记录无法添加");
@ -133,9 +139,10 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
            mixEnvelop.setMessage("心脏中心暂未开放");
        }
        basePatientDO.setSex(sex);
        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
        Date saveBirth = sf.parse(birth);
        basePatientDO.setBirthday(saveBirth);
        SimpleDateFormat sf3 = new SimpleDateFormat("yyyy-MM-dd");
        Date saveBirth1 = sf3.parse(birth);
        System.out.println("====="+saveBirth1);
        basePatientDO.setBirthday(saveBirth1);
        result.setFamilyRelation(dictId);
        result.setFamilyRelationName(dictName);
        result.setIsDel(1);
@ -155,31 +162,36 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
        if (sucessPatient!=null){
            patientNewId=sucessPatient.getId();
        }
        result.setFamilyMember(patientNewId);
        wlyyPatientFamilyMemberDao.save(result);
        patientMappingDO.setIdcard(idCard);
        patientMappingDO.setSource("1");
        patientMappingDO.setPatientName(familyName);
        patientMappingDO.setMappingCode(familyId);
        patientMappingDO.setPatient(patientNewId);
        patientMappingDO.setCreateTime(new Date());
        patientMappingDao.save(patientMappingDO);
        resultMap.put("patientId",patientId);
        resultMap.put("familyMember",patientNewId);
        resultMap.put("idCard",idCard);
        resultMap.put("phoneNum",phoneNum);
        resultMap.put("relationName",dictName);
        resultMap.put("name",familyName);
        resultMap.put("cardType",cardType);
        List<Map<String,Object>> resultList = new ArrayList();
        resultList.add(resultMap);
        mixEnvelop.setStatus(200);
        mixEnvelop.setMessage("添加成功");
        mixEnvelop.setDetailModelList(resultList);
            result.setFamilyMember(patientNewId);
            wlyyPatientFamilyMemberDao.save(result);
            patientMappingDO.setIdcard(idCard);
            patientMappingDO.setSource("1");
            patientMappingDO.setPatientName(familyName);
            patientMappingDO.setMappingCode(familyId);
            patientMappingDO.setPatient(patientNewId);
            patientMappingDO.setCreateTime(new Date());
            patientMappingDao.save(patientMappingDO);
            resultMap.put("patientId",patientId);
            resultMap.put("familyMember",patientNewId);
            resultMap.put("idCard",idCard);
            resultMap.put("phoneNum",phoneNum);
            resultMap.put("relationName",dictName);
            resultMap.put("name",familyName);
            resultMap.put("cardType",cardType);
            List<Map<String,Object>> resultList = new ArrayList();
            resultList.add(resultMap);
            mixEnvelop.setStatus(200);
            mixEnvelop.setMessage("添加成功");
            mixEnvelop.setDetailModelList(resultList);
        }catch (Exception e){
            e.printStackTrace();
            mixEnvelop.setStatus(408);
            mixEnvelop.setMessage("添加失败");
        }
        return mixEnvelop;
    }
    //根据患者id查询关联家属
    public List<Map<String,Object>> findFamilyByPatientId(String patientId) throws ParseException {
        String sql = "select t.id as \"id\",t.card_type as \"cardType\", " +

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

@ -5009,6 +5009,18 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        Date date = new Date();
        sql+="LEFT JOIN (SELECT  COUNT(t1.doctor) as workTotal, t1.doctor FROM  wlyy_doctor_work_time t1   WHERE   " +
                "t1.start_time <=:startTime  AND t1.end_time >=:endTime GROUP BY t1.doctor) dw ON dw.doctor=d.id ";
        sql+="LEFT JOIN (\n" +
                "\tSELECT\n" +
                "\t\tAVG(a.score) AS score,\n" +
                "\t\tb.doctor AS doctor\n" +
                "\tFROM\n" +
                "\t\tbase_evaluate a,\n" +
                "\t\tbase_evaluate_score b\n" +
                "\tWHERE\n" +
                "\t\ta.relation_code = b.id\n" +
                "\tGROUP BY\n" +
                "\t\tb.doctor\n" +
                ") evaluate ON evaluate.doctor = d.id";
        params.put("startTime", date);
        params.put("endTime", date);
        if ("1".equalsIgnoreCase(isAttention)) {
@ -5122,13 +5134,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
        if("xm_ykyy_wx".equalsIgnoreCase(wechatId)){
            if (flag){
                sql += " and d.del='1' order by dw.workTotal desc ,d.consult_status DESC ,a.total " + consutlSort;
                sql += " and d.del='1' order by d.consult_status DESC ,evaluate.score desc,a.total " + consutlSort;
            }else{
                sql += " and d.del='1' order by dw.workTotal desc nulls last,d.consult_status desc nulls last ,a.total " + consutlSort;
                sql += " and d.del='1' order by d.consult_status desc nulls last ,evaluate.score desc nulls last ,a.total " + consutlSort;
            }
        }else {
            sql += " and d.del='1' order by dw.workTotal desc ,d.consult_status DESC ,a.total " + consutlSort;
            sql += " and d.del='1' order by d.consult_status DESC ,evaluate.score desc,a.total " + consutlSort;
        }
        String sqlCount = "select count(1) as \"total\" from ( "+sql+" ) t";
        List<Map<String, Object>> list = hibenateUtils.createSQLQuery(sql, params, page, pagesize);

+ 2 - 1
svr/svr-internet-hospital-job/src/main/resources/application.yml

@ -285,7 +285,8 @@ hospital:
  SourceSysCode: S60
  TargetSysCode: S01
im:
  im_list_get: http://172.16.100.241:3000/
  im_list_get: http://192.168.118.240:3000/
#  im_list_get: http://172.16.100.241:3000/
  data_base_name: im
fastDFS:
  fastdfs_file_url: http://172.16.100.240:8888/

+ 17 - 0
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@ -1006,4 +1006,21 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
        return qrcodeService.getWXUserInfo(patient);
    }
    @PostMapping(value = "/getWXGZHQrcode")
    @ApiOperation(value = "生成微信公众号二维码")
    public ObjEnvelop createWXGZHQrcode(@ApiParam(name = "fileName", value = "文件名称")
                                         @RequestParam(value = "fileName", required = false) String fileName) throws Exception {
        ObjEnvelop objEnvelop= new ObjEnvelop();
        objEnvelop.setMessage(qrcodeService.createPublicQrcode(fileName));
        return objEnvelop;
    }
    @PostMapping(value = "/findWXGZHQrcode")
    @ApiOperation(value = "查询微信公众号二维码")
    public ObjEnvelop findWXGZHQrcode(@ApiParam(name = "orgCode", value = "医院code")
                                     @RequestParam(value = "orgCode", required = false) String orgCode) throws Exception {
        ObjEnvelop objEnvelop= new ObjEnvelop();
        objEnvelop.setMessage(qrcodeService.getWXGZHQrcode(orgCode));
        return objEnvelop;
    }
}

File diff suppressed because it is too large
+ 87 - 0
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/QrcodeService.java