代码修改

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

@@ -100,6 +100,7 @@ import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.common.LatitudeUtils;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.encrypt.MD5;
import com.yihu.jw.util.entity.ServiceException;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.util.wechat.WeixinMessagePushUtils;
import com.yihu.jw.utils.*;
@@ -5145,6 +5146,13 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
        outpatientDao.save(wlyyOutpatientDO);
        if(StringUtils.isNotBlank(wlyyOutpatientDO.getPlanId())){
            ServiceItemPlanDO serviceItemPlanDO = serviceItemPlanDao.findById(wlyyOutpatientDO.getPlanId()).orElse(null);
            if(serviceItemPlanDO!=null){
                serviceItemPlanDO.setStatus("0");
                serviceItemPlanDao.save(serviceItemPlanDO);
            }
        }
        //删除门诊号源
        List<WlyyPatientRegisterTimeDO> list = patientRegisterTimeDao.findByOutpatientId(wlyyOutpatientDO.getId());
@@ -15667,6 +15675,16 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }else {
            outpatientHospitalizationDO.setCreateTime(new Date());
        }
        WlyyOutpatientHospitalizationDO hospitalizationDO = outpatientHospitalizationDao.findByOutpatientId(outpatientHospitalizationDO.getOutpatientId());
        if(hospitalizationDO!=null){
            throw new ServiceException("改复诊已发起过住院申请，请勿重复发起");
        }
        BasePatientDO patientDO = basePatientDao.findById(outpatientHospitalizationDO.getPatient()).orElse(null);
        if(patientDO==null){
            throw new ServiceException("参数错误");
        }
        outpatientHospitalizationDO.setStatus(0);
        outpatientHospitalizationDO.setIdCard(patientDO.getIdcard());
        outpatientHospitalizationDO = outpatientHospitalizationDao.save(outpatientHospitalizationDO);
        DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(outpatientHospitalizationDO.getDoctor());
        String visitDoctor = doctorMappingDO.getDoctorName()+"/"+doctorMappingDO.getMappingCode();

business/base-service/src/main/java/com/yihu/jw/wlyy/service/WlyyBusinessService.java

@@ -780,6 +780,13 @@ public class WlyyBusinessService {
        return re;
    }
    //获取社区医生列表
    public JSONObject getDoctorList(String hospital, String doctorName, Integer page, Integer pageSize, String mobile) {
        String param = "?hospital="+nullToTransfor(hospital)+"&doctorName="+nullToTransfor(doctorName)+"&page="+page+"&pageSize="+pageSize+"&mobile="+nullToTransfor(mobile);
        JSONObject re = wlyyHttpService.sendWlyyMesGet("getDoctorList",param);
        return re;
    }
    //获取机构列表分页
    public JSONObject getHospitalList(String name, Integer page, Integer pageSize, String town) {
        String param = "?name="+nullToTransfor(name)+"&town="+nullToTransfor(town)+"&page="+page+"&pageSize="+pageSize;

common/common-entity/src/db/2024.sql

@@ -29,4 +29,7 @@ INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('knowledge_question_scene4', NULL, 'knowledge_question_scene', '4', '在线诊室', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '使用场景');
ALTER table wlyy_patient_family_member add COLUMN `medicare` varchar(50) DEFAULT NULL COMMENT '社保卡';
ALTER table wlyy_patient_family_member add COLUMN `medicare` varchar(50) DEFAULT NULL COMMENT '社保卡';
INSERT INTO `base`.`oauth_wlyy_config` (`id`, `app_id`, `app_secret`, `token_url`, `url`, `remark`) VALUES
    ('getDoctorList', '019bd04d-3cb2-433f-a530-03f0cdb083e5', '08cc3ec2-736b-4732-a8f0-f99eb6f9d311', 'https://www.xmtyw.cn/wlyytest/gc/accesstoken', 'https://www.xmtyw.cn/wlyytest/wlyygc/tongan/hospital/getDoctorList', '厦门I健康获取社区医生列表');

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyOutpatientHospitalizationDO.java

@@ -18,8 +18,10 @@ public class WlyyOutpatientHospitalizationDO extends UuidIdentityEntityWithOpera
    private String outpatientId;
    private String visitDeptCode;//就诊科室代码
    private String visitDeptName;//就诊科室名称
    private String visitNo;//就诊号
    private String inDeptCode;//入院科室代码
    private String inDeptName;//入院科室名称
    private String diagnosisCode;//入院诊断代码
    private String diagnosisName;//入院诊断代码名称
    private Integer admissionType;//入院方式，0-门诊 1-急诊 2-转入 5-留观
@@ -32,6 +34,7 @@ public class WlyyOutpatientHospitalizationDO extends UuidIdentityEntityWithOpera
    private String doctor;//医生编码
    private String doctorName;//医生姓名
    private String cardNo;//就诊卡号
    private String idCard;//身份证
    private Integer status;//0失败1成功
@@ -170,4 +173,28 @@ public class WlyyOutpatientHospitalizationDO extends UuidIdentityEntityWithOpera
    public void setCardNo(String cardNo) {
        this.cardNo = cardNo;
    }
    public String getIdCard() {
        return idCard;
    }
    public void setIdCard(String idCard) {
        this.idCard = idCard;
    }
    public String getVisitDeptName() {
        return visitDeptName;
    }
    public void setVisitDeptName(String visitDeptName) {
        this.visitDeptName = visitDeptName;
    }
    public String getInDeptName() {
        return inDeptName;
    }
    public void setInDeptName(String inDeptName) {
        this.inDeptName = inDeptName;
    }
}

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

@@ -47,6 +47,7 @@ import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
import com.yihu.jw.restmodel.web.*;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.util.entity.ServiceException;
import com.yihu.jw.wlyy.service.WlyyBusinessService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -3812,13 +3813,16 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            jsonObject.put("admissionCondition",hospitalizationDO.getAdmissionCondition());//入院病情
            imUtil.sendImMsg(hospitalizationDO.getDoctor(), hospitalizationDO.getDoctorName(), session_id, "50", jsonObject.toString(), "1", null);
            return success("操作成功",hospitalizationDO);
        } catch (Exception e) {
            return Envelop.getError(e.getMessage());
        }catch (ServiceException se){
            return Envelop.getError(se.getMessage());
        }catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("操作失败");
        }
    }
    @PostMapping("/selectHospitalizationByOutpatientId")
    @GetMapping("/selectHospitalizationByOutpatientId")
    @ApiOperation(value = "查询申请记录", notes = "查询申请记录")
    public Envelop selectHospitalizationByOutpatientId(
            @ApiParam(name = "outpatientId", value = "门诊id", required = false)

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/team/DoctorTeamEndpoint.java

@@ -83,6 +83,21 @@ public class DoctorTeamEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "getDoctorList")
    @ApiOperation(value = "获取社区医生列表")
    public String getDoctorList(@RequestParam(required = false) String hospital,
                                         @RequestParam(required = false) String doctorName,
                                         @RequestParam(required = false) Integer page,
                                         @RequestParam(required = false) Integer pageSize,
                                         @RequestParam(required = false) String mobile) {
        try {
            return wlyyBusinessService.getDoctorList(hospital,doctorName,page,pageSize,mobile).toJSONString();
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1,"查询失败");
        }
    }
    @GetMapping(value = "getHospitalList")
    @ApiOperation(value = "获取社区机构列表分页")
    public String getHospitalList(@RequestParam(required = false) String name,