Forráskód Böngészése

Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

liubing 4 éve
szülő
commit
68408823e1

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

@ -10170,4 +10170,31 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        return outpatient;
    }
    public String savePrescriptionToDoorService(String orderId,String prescriptionId){
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("doorServiceUrl");
        String url = "";
        if (wlyyHospitalSysDictDO!=null){
            url = wlyyHospitalSysDictDO.getDictValue();
        }
        logger.info("url:"+url);
        String res = "";
        Map map = new HashMap();
        map.put("orderId",orderId);
        map.put("prescriptionCode",prescriptionId);
        logger.info("入参:"+map);
        try {
            res = httpClientUtil.httpPost(url,map);
            logger.info("调用保存上门开方信息接口返回结果=>"+res);
            if (StringUtils.isNoneBlank(res)){
                com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(res);
                if ("200".equalsIgnoreCase(jsonObject.getString("status"))){
                    return jsonObject.getString("msg");
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        return "接口调用失败";
    }
}

+ 2 - 0
business/base-service/src/main/java/com/yihu/jw/org/dao/BaseOrgDao.java

@ -43,6 +43,8 @@ public interface BaseOrgDao extends PagingAndSortingRepository<BaseOrgDO, String
    @Query("select code as code,name as name from BaseOrgDO where del = 1")
    List<Map<String,Object>> findOrgListBySaasId();
    @Query("select a from BaseOrgDO a where a.del = '1'")
    List<BaseOrgDO> findByAll();
    List<BaseOrgDO> findByCityCode(String cityCode);

+ 1 - 0
common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@ -532,6 +532,7 @@ public class BaseHospitalRequestMapping {
        public static final String findPatNoByPatient = "/findPatNoByPatient";
        public static final String appletSign= "/appletSign";
        public static final String doorServiceTest= "/doorServiceTest";
    }
    public static class YkyyPrescription extends BaseHospitalRequestMapping.Basic {

+ 8 - 0
svr/svr-door-serivce/sql/初始sql.sql

@ -614,6 +614,14 @@ INSERT INTO `base`.`base_system_dict_entry` (`id`, `saas_id`, `dict_code`, `code
INSERT INTO `base`.`base_system_dict_entry` (`id`, `saas_id`, `dict_code`, `code`, `py_code`, `value`, `sort`, `remark`) VALUES ('8', NULL, 'PROFESSIONAL_STATE', '7', '1', '不便分类的其他从业人员', '8', NULL);
INSERT INTO `base`.`base_system_dict_entry` (`id`, `saas_id`, `dict_code`, `code`, `py_code`, `value`, `sort`, `remark`) VALUES ('9', NULL, 'PROFESSIONAL_STATE', '8', '1', '无职业', '9', NULL);
INSERT INTO `base`.`base_system_dict_entry` (`id`, `saas_id`, `dict_code`, `code`, `py_code`, `value`, `sort`, `remark`) VALUES ('10', NULL, 'door_service_subject_class_dict', '4', '4', '检验费', '1', '上门服务项类型');
INSERT INTO `base`.`base_system_dict_entry` (`id`, `saas_id`, `dict_code`, `code`, `py_code`, `value`, `sort`, `remark`) VALUES ('11', NULL, 'door_service_subject_class_dict', '28', '28', '检查费', '2', NULL);
INSERT INTO `base`.`base_system_dict_entry` (`id`, `saas_id`, `dict_code`, `code`, `py_code`, `value`, `sort`, `remark`) VALUES ('12', NULL, 'door_service_subject_class_dict', '89', '89', '护理费', '3', NULL);
INSERT INTO `base`.`base_system_dict_entry` (`id`, `saas_id`, `dict_code`, `code`, `py_code`, `value`, `sort`, `remark`) VALUES ('13', NULL, 'door_service_subject_class_dict', '148', '148', '推拿', '4', NULL);
INSERT INTO `base`.`base_system_dict_entry` (`id`, `saas_id`, `dict_code`, `code`, `py_code`, `value`, `sort`, `remark`) VALUES ('14', NULL, 'door_service_subject_class_dict', '149', '149', '针灸', '5', NULL);
CREATE TABLE `wlyy_doctor_quick_reply` (
  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
  `doctor` varchar(50) NOT NULL COMMENT '医生',

+ 13 - 0
svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/DoctorController.java

@ -115,6 +115,19 @@ public class DoctorController extends BaseController {
        }
    }
    @GetMapping(value = "getHospitals")
    @ApiOperation("获取医院")
    public String getHospitals() {
        try {
            List<BaseOrgDO> orgDOs = orgDao.findByAll();
            return write(200, "查询成功", "data", orgDOs);
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");
        }
    }
    /**
     * 医生基本信息查询接口
     *

+ 1 - 1
svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/DoorOrderController.java

@ -1230,7 +1230,7 @@ public class DoorOrderController extends BaseController {
    }
    @ApiOperation("导出服务小结到word")
    @RequestMapping(value = "exportConclusion", method = RequestMethod.GET)
    @RequestMapping(value = "excelControl/exportConclusion", method = RequestMethod.GET)
    public void writeWordFile(@ApiParam(name = "urlString", value = "链接地址") @RequestParam(required = false) String urlString,
                              @ApiParam(name = "orderId", value = "订单id", required = true) @RequestParam String orderId,
                              HttpServletResponse response) {

+ 13 - 13
svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/DoorStatisticAnalyzeController.java

@ -71,7 +71,7 @@ public class DoorStatisticAnalyzeController extends BaseController {
            @ApiParam(name = "endDate", value = "搜索,结束时间",required = false)
            @RequestParam(value = "endDate", required = false) String endDate,
            @RequestParam(required = false) String lowLevel,
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5团队",defaultValue = "")@RequestParam(required = true) Integer level
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5科室 6医生",defaultValue = "")@RequestParam(required = true) Integer level
    ){
        try{
@ -98,7 +98,7 @@ public class DoorStatisticAnalyzeController extends BaseController {
            @ApiParam(name = "endDate", value = "搜索,结束时间",required = false)
            @RequestParam(value = "endDate", required = false) String endDate,
            @RequestParam(required = false) String lowLevel,
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5团队",defaultValue = "")@RequestParam(required = true) Integer level
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5科室 6医生",defaultValue = "")@RequestParam(required = true) Integer level
    ){
        try{
@ -123,7 +123,7 @@ public class DoorStatisticAnalyzeController extends BaseController {
            @RequestParam(value = "startDate", required = false) String startDate,
            @ApiParam(name = "endDate", value = "搜索,结束时间",required = false)
            @RequestParam(value = "endDate", required = false) String endDate,
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5团队",defaultValue = "")@RequestParam(required = true) Integer level
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5科室 6医生",defaultValue = "")@RequestParam(required = true) Integer level
    ){
        try{
@ -150,7 +150,7 @@ public class DoorStatisticAnalyzeController extends BaseController {
            @RequestParam(value = "endDate", required = false) String endDate,
            @ApiParam(name = "type", value = "发起类型(1本人发起 2家人待预约 3医生代预约)",required = false)
            @RequestParam(value = "type", required = false) Integer type,
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5团队",defaultValue = "")@RequestParam(required = true) Integer level
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5科室 6医生",defaultValue = "")@RequestParam(required = true) Integer level
    ){
        try{
@ -178,7 +178,7 @@ public class DoorStatisticAnalyzeController extends BaseController {
            @RequestParam(required = false) String lowLevel,
            @ApiParam(name = "type", value = "发起类型(1本人发起 2家人待预约 3医生代预约)",required = false)
            @RequestParam(value = "type", required = false) Integer type,
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5团队",defaultValue = "")@RequestParam(required = true) Integer level
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5科室 6医生",defaultValue = "")@RequestParam(required = true) Integer level
    ){
        try{
@ -205,7 +205,7 @@ public class DoorStatisticAnalyzeController extends BaseController {
            @RequestParam(value = "endDate", required = false) String endDate,
            @ApiParam(name = "roleType", value = "1、调度员,2、服务医生",required = true)
            @RequestParam(value = "roleType", required = true) Integer roleType,
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5团队",defaultValue = "")@RequestParam(required = true) Integer level
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5科室 6医生",defaultValue = "")@RequestParam(required = true) Integer level
    ){
        try{
@ -234,7 +234,7 @@ public class DoorStatisticAnalyzeController extends BaseController {
            @RequestParam(required = false) String lowLevel,
            @ApiParam(name = "roleType", value = "1、调度员,2、服务医生",required = true)
            @RequestParam(value = "roleType", required = true) Integer roleType,
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5团队",defaultValue = "")@RequestParam(required = true) Integer level
            @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5科室 6医生",defaultValue = "")@RequestParam(required = true) Integer level
    ){
        try{
@ -449,7 +449,7 @@ public class DoorStatisticAnalyzeController extends BaseController {
    public String doorAggregateAnalysis(
            @ApiParam(name = "area", value = "区域code:如思明区350203,团队641",required = false)
            @RequestParam(value = "area", required = false) String area,
            @ApiParam(name = "level", value = "等级,2市  3区  4社区 5团队",required = false)
            @ApiParam(name = "level", value = "等级,2市  3区  4社区 5科室 6 医生",required = false)
            @RequestParam(required = true) int level,
            @ApiParam(name = "startDate", value = "搜索,开始时间",required = false)
            @RequestParam(value = "startDate", required = false) String startDate,
@ -478,7 +478,7 @@ public class DoorStatisticAnalyzeController extends BaseController {
    public String getDoorDiagnosisAnalysis(
            @ApiParam(name = "area", value = "区域code:如思明区350203,团队641",required = false)
            @RequestParam(value = "area", required = false) String area,
            @ApiParam(name = "level", value = "等级,2市  3区  4社区 5团队",required = false)
            @ApiParam(name = "level", value = "等级,2市  3区  4社区 5科室 6医生",required = false)
            @RequestParam(required = true) int level,
            @ApiParam(name = "startDate", value = "搜索,开始时间",required = false)
            @RequestParam(value = "startDate", required = false) String startDate,
@ -510,7 +510,7 @@ public class DoorStatisticAnalyzeController extends BaseController {
    public String getDoorDrugCodeAnalysis(
            @ApiParam(name = "area", value = "区域code:如思明区350203,团队641",required = false)
            @RequestParam(value = "area", required = false) String area,
            @ApiParam(name = "level", value = "等级,2市  3区  4社区 5团队",required = false)
            @ApiParam(name = "level", value = "等级,2市  3区  4社区 5科室 6医生",required = false)
            @RequestParam(required = true) int level,
            @ApiParam(name = "subjectClass", value = "科目类别,010开头为药品,020为服务项目",required = false)
            @RequestParam(value = "subjectClass", required = false) String subjectClass,
@ -604,7 +604,7 @@ public class DoorStatisticAnalyzeController extends BaseController {
    public String serviceOrderTrend(
            @ApiParam(name = "area", value = "区域code:如思明区350203,团队641",required = false)
            @RequestParam(value = "area", required = false) String area,
            @ApiParam(name = "level", value = "等级,2市  3区  4社区 5团队",required = false)
            @ApiParam(name = "level", value = "等级,2市  3区  4社区 5科室 6医生",required = false)
            @RequestParam(required = true) int level,
            @ApiParam(name="interval",value="统计类型:1按天,2按周,3按月",defaultValue = "")
            @RequestParam(required = true) String interval,
@ -659,7 +659,7 @@ public class DoorStatisticAnalyzeController extends BaseController {
    public String doorServiceItemAnalysis(
            @ApiParam(name = "area", value = "区域code:如思明区350203,团队641",required = false)
            @RequestParam(value = "area", required = false) String area,
            @ApiParam(name = "level", value = "等级,2市  3区  4社区 5团队",required = false)
            @ApiParam(name = "level", value = "等级,2市  3区  4社区 5科室 6团队",required = false)
            @RequestParam(required = true) int level,
            @ApiParam(name = "pageSize", value = "页面大小,默认6 返回全部传999",required = true)
            @RequestParam(value = "pageSize", required = true) Integer pageSize,
@ -694,7 +694,7 @@ public class DoorStatisticAnalyzeController extends BaseController {
                                        @ApiParam(name="slaveKey1",value="类型 5 产后,6 新生儿,7 严重精神疾病,8 80岁以上老人,9 肺结核",defaultValue = "")
                                            @RequestParam(required = false) String slaveKey1,
                                        @ApiParam(name="area",value="区域code",defaultValue = "")@RequestParam(required = true) String area,
                                        @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5团队",defaultValue = "")@RequestParam(required = true) Integer level) {
                                        @ApiParam(name="level",value="1 省 2 市 3 区县 4 机构 5科室 6医生",defaultValue = "")@RequestParam(required = true) Integer level) {
        try {
            JSONObject jsonObject = doorStatisticAnalyzeService.getHomeVisitTotalHead(startDate,endDate,area,level,slaveKey1);
            return write(200, "查询成功", "data", jsonObject);

+ 10 - 8
svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/common/ServerPackageService.java

@ -116,14 +116,16 @@ public class ServerPackageService  {
    public List<Map<String,Object>> selectTypes(){
        String sql1 = "SELECT zisc.class_code AS code, zisc.class_name AS type FROM zy_iv_subject_class_dict zisc " +
                "WHERE zisc.class_code IN ( SELECT DISTINCT SUBSTR(zicd.subject_class, 1, 4) AS subjectCatagory " +
                "FROM zy_iv_clinic_dict zicd WHERE LENGTH(zicd.subject_class) > 4 )";
        List<Map<String,Object>> mapList1 = jdbcTemplate.queryForList(sql1);
        Map<String,Object> map = new HashedMap();
        map.put("code","used");
        map.put("type","常用");
        mapList1.add(map);
        String sql = "SELECT code,value type from base_system_dict_entry WHERE dict_code = 'PROFESSIONAL_STATE' ORDER BY sort";
        List<Map<String,Object>> mapList1 = jdbcTemplate.queryForList(sql);
        Map<String,Object> map1 = new HashedMap();
        map1.put("code","used");
        map1.put("type","常用");
        mapList1.add(map1);
        Map<String,Object> map2 = new HashedMap();
        map2.put("code","other");
        map2.put("type","其他");
        mapList1.add(map2);
        return mapList1;
    }

+ 1 - 1
svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/common/WlyyMessageService.java

@ -57,7 +57,7 @@ public class WlyyMessageService {
            object.put("del",one.get("del"));
            object.put("title",one.get("title"));
            object.put("type",one.get("type"));
            object.put("content",one.get("content"));
            object.put("content",one.get("data"));
            object.put("sender",one.get("sender"));
            object.put("id",one.get("id"));
            object.put("relation_code",one.get("relation_code"));

+ 41 - 6
svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/statics/DoorStatisticAnalyzeService.java

@ -66,6 +66,8 @@ public class DoorStatisticAnalyzeService {
                map = esModelList.stream().collect(Collectors.groupingBy(SaveModel::getHospital));
            } else if (lowLevel.equals("5")) {
                map = esModelList.stream().collect(Collectors.groupingBy(SaveModel::getDept));
            }else if (lowLevel.equals("6")) {
                map = esModelList.stream().collect(Collectors.groupingBy(SaveModel::getDoctor));
            }
            for (String one1 : map.keySet()) {
                Map<String, Object> resultMap = new HashMap();
@ -77,6 +79,8 @@ public class DoorStatisticAnalyzeService {
                    resultMap.put("name", list1.get(0).getHospitalName());
                } else if (lowLevel.equals("5")) {
                    resultMap.put("name", list1.get(0).getDeptName());
                }else if (lowLevel.equals("6")) {
                    resultMap.put("name", list1.get(0).getDoctorName());
                }
                Map<String, List<SaveModel>> map2 = list1.stream().collect(Collectors.groupingBy(SaveModel::getSlaveKey1));
                //0、审核中,1、未通过,2、已通过
@ -302,6 +306,8 @@ public class DoorStatisticAnalyzeService {
                map = esModelList.stream().collect(Collectors.groupingBy(SaveModel::getHospital));
            } else if (lowLevel.equals("5")) {
                map = esModelList.stream().collect(Collectors.groupingBy(SaveModel::getDept));
            }else if(lowLevel.equals("6")){
                map = esModelList.stream().collect(Collectors.groupingBy(SaveModel::getDoctor));
            }
            for (String one1 : map.keySet()) {
                Map<String, Object> resultMap = new HashMap();
@ -313,6 +319,8 @@ public class DoorStatisticAnalyzeService {
                    resultMap.put("name", list1.get(0).getHospitalName());
                } else if (lowLevel.equals("5")) {
                    resultMap.put("name", list1.get(0).getDeptName());
                }else if (lowLevel.equals("6")) {
                    resultMap.put("name", list1.get(0).getDoctorName());
                }
                Map<String, List<SaveModel>> map2 = list1.stream().collect(Collectors.groupingBy(SaveModel::getSlaveKey1));
                //工单状态:-1-已取消,1-待(调度员)派单,2-待(医生)接单,3-待服务,4-待付款,5-待评价,6-已完成,评价均分-evaluateSplit
@ -417,6 +425,8 @@ public class DoorStatisticAnalyzeService {
                map = esModelList.stream().collect(Collectors.groupingBy(SaveModel::getHospital));
            } else if (lowLevel.equals("5")) {
                map = esModelList.stream().collect(Collectors.groupingBy(SaveModel::getDept));
            }else if (lowLevel.equals("6")) {
                map = esModelList.stream().collect(Collectors.groupingBy(SaveModel::getDoctor));
            }
            for (String one1 : map.keySet()) {
                Map<String, Object> resultMap = new HashMap();
@ -428,6 +438,8 @@ public class DoorStatisticAnalyzeService {
                    resultMap.put("name", list1.get(0).getHospitalName());
                } else if (lowLevel.equals("5")) {
                    resultMap.put("name", list1.get(0).getDeptName());
                }else if (lowLevel.equals("6")) {
                    resultMap.put("name", list1.get(0).getDoctorName());
                }
                Map<String, List<SaveModel>> map2 = list1.stream().collect(Collectors.groupingBy(SaveModel::getSlaveKey1));
                resultMap.put("h01", map2.get("1").get(0).getResult2().intValue());
@ -580,6 +592,8 @@ public class DoorStatisticAnalyzeService {
                map = esModelList.stream().collect(Collectors.groupingBy(SaveModel::getHospital));
            } else if (lowLevel.equals("5")) {
                map = esModelList.stream().collect(Collectors.groupingBy(SaveModel::getDept));
            }else if (lowLevel.equals("6")) {
                map = esModelList.stream().collect(Collectors.groupingBy(SaveModel::getDoctor));
            }
            for (String one1 : map.keySet()) {
                Map<String, Object> resultMap = new HashMap();
@ -591,6 +605,8 @@ public class DoorStatisticAnalyzeService {
                    resultMap.put("name", list1.get(0).getHospitalName());
                } else if (lowLevel.equals("5")) {
                    resultMap.put("name", list1.get(0).getDeptName());
                }else if (lowLevel.equals("6")) {
                    resultMap.put("name", list1.get(0).getDoctorName());
                }
                //上门出诊人次
                Map<String, List<SaveModel>> map2 = list1.stream().collect(Collectors.groupingBy(SaveModel::getSlaveKey1));
@ -1017,8 +1033,8 @@ public class DoorStatisticAnalyzeService {
            low_level = lowLevel;
        }
        if (SaveModel.deptLevel.equals(low_level)) {
            sql.append("select team,teamName,slaveKey1,slaveKey1Name,sum(result1) result1, sum(result2) result2,quotaDate from " + esIndex + " where ");
            groupBy.append("  group by team,teamName");
            sql.append("select dept,deptName,slaveKey1,slaveKey1Name,sum(result1) result1, sum(result2) result2,quotaDate from " + esIndex + " where ");
            groupBy.append("  group by dept,deptName");
            groupBy.append(",slaveKey1,slaveKey1Name");
        } else if (SaveModel.OrgLevel.equals(low_level)) {
            sql.append("select hospital,hospitalName,slaveKey1,slaveKey1Name,sum(result1) result1,sum(result2) result2,quotaDate from " + esIndex + " where ");
@ -1032,17 +1048,23 @@ public class DoorStatisticAnalyzeService {
            sql.append("select city,cityName,slaveKey1,slaveKey1Name,sum(result1) result1,sum(result2) result2,quotaDate from " + esIndex + " where ");
            groupBy.append("  group by city,cityName");
            groupBy.append(",slaveKey1,slaveKey1Name");
        }else if (SaveModel.doctorLevel.equals(low_level)) {
            sql.append("select doctor,doctorName,slaveKey1,slaveKey1Name,sum(result1) result1,sum(result2) result2,quotaDate from " + esIndex + " where ");
            groupBy.append("  group by doctor,doctorName");
            groupBy.append(",slaveKey1,slaveKey1Name");
        }
        if (StringUtils.isNotEmpty(area)) {
            if (SaveModel.deptLevel.equals(level + "")) {
                sql.append(" team='" + area + "'");
                sql.append(" dept='" + area + "'");
            } else if (SaveModel.OrgLevel.equals(level + "")) {
                sql.append(" hospital='" + area + "'");
            } else if (SaveModel.townLevel.equals(level + "")) {
                sql.append(" town='" + area + "'");
            } else if (SaveModel.cityLevel.equals(level + "")) {
                sql.append(" city='" + area + "'");
            }else if (SaveModel.doctorLevel.equals(level + "")) {
                sql.append(" doctor='" + area + "'");
            }
            sql.append(" and ");
        }
@ -1148,7 +1170,10 @@ public class DoorStatisticAnalyzeService {
        }else if(level == 4){
            whereSql += "and f.hospital = '" + area + "' ";
        }else if(level == 5){
            whereSql += "and f.admin_team_code='" + area + "' ";
            sql = sql.replace("f.patient = o.patient","f.patient = o.patient join wlyy.wlyy_doctor d on f.doctor = d.code and d.`status`= 1 ");
            whereSql += "and d.dept='" +area + "' ";
        }else if(level == 6){
            whereSql += "and (f.doctor = '"+ area + "' or f.doctor_health = '"+area + "') ";
        }
        Integer doorPatientService = jdbcTemplate.queryForObject(sql + whereSql, Integer.class);
        resMap.put("doorPatientServiceCount", doorPatientService);
@ -1197,7 +1222,10 @@ public class DoorStatisticAnalyzeService {
        }else if(level == 4){
            sql += "and f.hospital = '" + area + "' ";
        }else if(level == 5){
            sql += "and f.admin_team_code='" + area + "' ";
            sql = sql.replace("f.patient = p.patient","f.patient = o.patient join wlyy.wlyy_doctor d on f.doctor = d.code and d.`status`= 1 ");
            sql += "and d.dept='" +area + "' ";
        }else if(level == 6){
            sql += "and (f.doctor = '"+ area + "' or f.doctor_health = '"+area + "') ";
        }
        if(StringUtils.isNotBlank(startDate)){
            sql += "and p.create_time >= '" + startDate + "' ";
@ -1232,7 +1260,10 @@ public class DoorStatisticAnalyzeService {
        }else if(level == 4){
            drugSql += "and f.hospital = '" + area + "' ";
        }else if(level == 5){
            drugSql += "and f.admin_team_code='" + area + "' ";
            drugSql = drugSql.replace("f.patient = p.patient","f.patient = o.patient join wlyy.wlyy_doctor d on f.doctor = d.code and d.`status`= 1 ");
            drugSql += "and d.dept='" +area + "' ";
        }else if(level == 6){
            drugSql += "and (f.doctor = '"+ area + "' or f.doctor_health = '"+area + "') ";
        }
        drugSql += "GROUP BY d.drug_code order by orderCount desc, patientCount desc limit " + (page-1) * pageSize + "," + pageSize;
        List<Map<String, Object>> list = jdbcTemplate.queryForList(drugSql);
@ -1261,6 +1292,8 @@ public class DoorStatisticAnalyzeService {
            map1 = slaveList.stream().collect(Collectors.groupingBy(SaveModel::getTown));
        } else if (SaveModel.deptLevel.equals(lowLevel)) {
            map1 = slaveList.stream().collect(Collectors.groupingBy(SaveModel::getDept));
        }else if (SaveModel.doctorLevel.equals(lowLevel)) {
            map1 = slaveList.stream().collect(Collectors.groupingBy(SaveModel::getDoctor));
        }
//        Map<String, List<SaveModel>> map1 = slaveList.stream().collect(Collectors.groupingBy(SaveModel::getHospital));
        for (String one1 : map1.keySet()) {
@ -1273,6 +1306,8 @@ public class DoorStatisticAnalyzeService {
                childrenResultMap.put("name", list1.get(0).getTownName());
            } else if (SaveModel.deptLevel.equals(lowLevel)) {
                childrenResultMap.put("name", list1.get(0).getDeptName());
            }else if (SaveModel.doctorLevel.equals(lowLevel)) {
                childrenResultMap.put("name", list1.get(0).getDoctorName());
            }
            Map<String, List<SaveModel>> map2 = list1.stream().collect(Collectors.groupingBy(SaveModel::getSlaveKey1));
            //工单状态:-1-已取消,1-待(调度员)派单,2-待(医生)接单,3-待服务,4-待服务,5-待评价,6-已完成,评价均分-evaluateSplit

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
svr/svr-door-serivce/src/main/resources/conclusion.mht


+ 16 - 1
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@ -512,7 +512,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                    @ApiParam(name = "prescriptionId", value = "处方id")
                                        @RequestParam(value = "prescriptionId", required = false)String prescriptionId,
                                    @ApiParam(name = "hisId", value = "审方唯一标识")
                                        @RequestParam(value = "hisId", required = false)String hisId)throws Exception {
                                        @RequestParam(value = "hisId", required = false)String hisId,
                                    @ApiParam(name = "orderId", value = "上门服务订单号")
                                        @RequestParam(value = "orderId", required = false)String orderId)throws Exception {
        Map<String,Object> result = prescriptionService.makeDiagnosis(outPatientId,prescriptionId,advice,type,infoJsons,diagnosisJson,inspectionJson,emrJson,hisId);
        try {
@ -535,6 +537,10 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findOne(outPatientId);
            String immsg = imService.pushHuiZhenMsg(msgObj,wlyyOutpatientDO.getDoctor(),wlyyOutpatientDO.getDoctorName(),outPatientId,wlyyOutpatientDO.getPatient(),wlyyOutpatientDO.getOutpatientType());
            System.out.println("发送诊断消息成功:"+immsg);
            if (result.get("prescriptionId")!=null&&StringUtils.isNoneBlank(orderId)){
              prescriptionService.savePrescriptionToDoorService(orderId,result.get("prescriptionId").toString());
            }
        }catch (Exception e){
            System.out.println("发送诊断消息失败:"+e.getMessage());
//            e.printStackTrace();
@ -2357,7 +2363,16 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.doorServiceTest)
    @ApiOperation(value = "测试上门复诊数据同步")
    public Envelop doorServiceTest(
            @ApiParam(name = "orderId", value = "orderId")
            @RequestParam(value = "orderId",defaultValue = "",required = false) String orderId,
            @ApiParam(name = "prId", value = "prId")
            @RequestParam(value = "prId",defaultValue = "",required = false) String prId) throws Exception {
        return success(prescriptionService.savePrescriptionToDoorService(orderId,prId));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.selectMzRecord)
    @ApiOperation(value = "查询门诊记录下的患者列表")
    public Envelop selectMzRecord(