修复患者注册后，手机号码为空的问题；全科导诊接口开发；

cloud-common/cloud-common-security/src/main/java/cn/sh/stc/sict/cloud/common/security/util/SecurityUtils.java

@@ -178,6 +178,7 @@ public class SecurityUtils {
                 current.setName(StrUtil.isBlank(user.getName()) ? user.getUsername() : user.getName());
                 current.setOpenId(user.getOpenId());
                 current.setAppId(user.getAppId());
+                current.setPhone(user.getPhone());
             }
             current.setToken(token);
             return current;

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpGpIntelligentQAController.java

@@ -38,7 +38,7 @@ public class HpGpIntelligentQAController {
         String from = StrUtil.isNotBlank(current.getOpenId()) ? current.getOpenId() : current.getId().toString();
 
         String xml = "<xml>\n" +
-                "  <ToUserName><![CDATA[gh_fe5b36b12c61]]></ToUserName>\n" +
+                "  <ToUserName><![CDATA[huangpurobot]]></ToUserName>\n" +
                 "  <FromUserName><![CDATA[" + from + "]]></FromUserName>\n" +
                 "  <CreateTime>" + DateUtil.now() + "</CreateTime>\n" +
                 "  <MsgType><![CDATA[text]]></MsgType>\n" +

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpgpBusyIdlePredictionController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.api.ApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -27,7 +28,8 @@ public class HpgpBusyIdlePredictionController extends ApiController {
      */
     private final HpgpBusyIdlePredictionService hpgpBusyIdlePredictionService;
 
-    public R<?> busyIdlePrediction(@ApiParam("标准") @RequestParam("deptName") String deptName){
+    @GetMapping
+    public R<?> busyIdlePrediction(@ApiParam("标准科室名称") @RequestParam("deptName") String deptName){
         return new R<>().success(hpgpBusyIdlePredictionService.busyIdlePrediction(deptName));
     }
 

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpBusyIdlePredictionServiceImpl.java

@@ -42,6 +42,8 @@ public class HpgpBusyIdlePredictionServiceImpl extends ServiceImpl<HpgpBusyIdleP
                 new LambdaQueryWrapper<HpgpBusyIdlePrediction>()
                         .in(HpgpBusyIdlePrediction::getHospitalCode, hospitalCodes)
                         .in(HpgpBusyIdlePrediction::getDeptCode, deptCodes)
+                        .gt(HpgpBusyIdlePrediction::getPredictionDate, "")
+                        .le(HpgpBusyIdlePrediction::getPredictionDate, "")
         );
     }
 }

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HpDeptInfoController.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -29,6 +30,7 @@ public class HpDeptInfoController extends ApiController {
     private final HpDeptInfoService hpDeptInfoService;
 
     @ApiOperation("科室医生查询接口")
+    @GetMapping
     public R<?> getDeptDoctors(@ApiParam("医院代码") @RequestParam("hospitalCode") String hospitalCode,
                                @ApiParam("科室代码") @RequestParam("deptCode") String deptCode){
         return new R<>(hpDeptInfoService.getDeptDoctors(hospitalCode, deptCode));

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HpHyIntelligentQAController.java

@@ -23,7 +23,7 @@ import java.util.Map;
 @RestController
 @AllArgsConstructor
 @Api(tags = "[C]黄浦高血压专病导医——智能问答")
-@RequestMapping("/hphy/c/intelligent/qa")
+@RequestMapping("/c/intelligent/qa")
 public class HpHyIntelligentQAController {
     private final static String CONTENT = "Content";
 

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HphyPatientBaseController.java

@@ -48,9 +48,6 @@ public class HphyPatientBaseController {
         CurrentUser current = SecurityUtils.getCurrentUser();
         HphyPatientBase base = hphyPatientBaseService.getByOpenId(current.getOpenId());
         patient.setOpenId(current.getOpenId());
-//        if(!ValidateCodeUtil.validateCode(redisTemplate, patient.getPhone(), patient.getRandomCode(), Constant.BYTE_YES)){
-//            return new R().error("验证码错误！");
-//        }
 
         if (base != null) {
             patient.setId(base.getId());

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/service/impl/HpDeptInfoServiceImpl.java

@@ -3,8 +3,10 @@ package cn.sh.stc.sict.theme.hphy.service.impl;
 import cn.sh.stc.sict.theme.hphy.constant.DataConstant;
 import cn.sh.stc.sict.theme.hphy.dao.HpDeptInfoMapper;
 import cn.sh.stc.sict.theme.hphy.dao.HpDocInfoMapper;
+import cn.sh.stc.sict.theme.hphy.dao.HpHosInfoMapper;
 import cn.sh.stc.sict.theme.hphy.model.HpDeptInfo;
 import cn.sh.stc.sict.theme.hphy.model.HpDocInfo;
+import cn.sh.stc.sict.theme.hphy.model.HpHosInfo;
 import cn.sh.stc.sict.theme.hphy.service.HpDeptInfoService;
 import cn.sh.stc.sict.theme.hphy.vo.DeptDoctorsVO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -26,9 +28,11 @@ import java.util.List;
 @Service("hpDeptInfoService")
 public class HpDeptInfoServiceImpl extends ServiceImpl<HpDeptInfoMapper, HpDeptInfo> implements HpDeptInfoService {
     private final HpDocInfoMapper hpDocInfoMapper;
+    private final HpHosInfoMapper hpHosInfoMapper;
 
     @Override
     public DeptDoctorsVO getDeptDoctors(String hospitalCode, String deptCode) {
+        HpHosInfo hosInfo = hpHosInfoMapper.selectById(hospitalCode);
         // 查询科室信息
         // 查询医生信息
         HpDeptInfo deptInfo = this.getOne(
@@ -53,6 +57,6 @@ public class HpDeptInfoServiceImpl extends ServiceImpl<HpDeptInfoMapper, HpDeptI
 
         List<HpDocInfo> doctors = hpDocInfoMapper.selectList(docWrapper);
 
-        return new DeptDoctorsVO(deptInfo, doctors);
+        return new DeptDoctorsVO(hosInfo, deptInfo, doctors);
     }
 }

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/vo/DeptDoctorsVO.java

@@ -2,6 +2,7 @@ package cn.sh.stc.sict.theme.hphy.vo;
 
 import cn.sh.stc.sict.theme.hphy.model.HpDeptInfo;
 import cn.sh.stc.sict.theme.hphy.model.HpDocInfo;
+import cn.sh.stc.sict.theme.hphy.model.HpHosInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,6 +18,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 public class DeptDoctorsVO {
+    private HpHosInfo hosInfo;
     private HpDeptInfo deptInfo;
     private List<HpDocInfo> doctors;
 }

smart-health-modules/theme-schema/src/main/resources/mapper/hpgp/HpgpDepartmentRankMapper.xml

@@ -13,7 +13,7 @@
 
     <sql id="Base_Column_List"> standard_dept , hospital_code, hospital_name, dept_code, dept_name, rank_score     </sql>
 
-    <select id="getRankByStandardDept">
+    <select id="getRankByStandardDept" resultMap="HpgpDepartmentRankMap">
         select
         <include refid="Base_Column_List" />
         from hpgp_department_rank where standard_dept = #{deptName} order by rank_score asc limit #{size}