海沧医保接口

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

@@ -619,6 +619,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                " o.consumer_mobile as \"consumerMobile\", "+
                " o.disease_code as \"diseaseCode\", "+
                " o.disease_name as \"diseaseName\", "+
                " o.is_disease as \"isDisease\", "+
                " o.fee as \"fee\", ";
        if ("xm_ykyy_wx".equals(wechatId)) {
            if (flag){
@@ -745,6 +746,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        rs.put("birthday", DateUtil.dateToStr(basePatientDO.getBirthday(), "yyyy-MM-dd"));
        rs.put("diseaseCode",outpatientDO.getDiseaseCode());
        rs.put("diseaseName",outpatientDO.getDiseaseName());
        rs.put("isDisease",outpatientDO.getIsDisease());
        rs.put("inquirySign",outpatientDO.getInquirySign());
        rs.put("visitType",outpatientDO.getVisitType());
        rs.put("virusFlag",outpatientDO.getVirusFlag());
@@ -2712,7 +2714,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @param diagnosisJson
     * @return
     */
    public Map<String, Object> makeDiagnosis(String outPatientId,String prescriptionId, String advice, String type, String infoJsons, String diagnosisJson, String inspectionJson, String emrJson,String hisId,String diseaseCode,String diseaseName) throws Exception {
    public Map<String, Object> makeDiagnosis(String outPatientId,String prescriptionId, String advice, String type, String infoJsons, String diagnosisJson, String inspectionJson, String emrJson,String hisId,String diseaseCode,String diseaseName,String isDisease) throws Exception {
        Map<String, Object> result = new HashedMap();
@@ -2723,6 +2725,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        //设置特殊病种
        outpatientDO.setDiseaseCode(diseaseCode);
        outpatientDO.setDiseaseName(diseaseName);
        outpatientDO.setIsDisease(isDisease);
        //========================处方操作=============================================================
        //创建处方记录
@@ -15817,11 +15820,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @param medicalState
     * @return
     */
    public WlyyOutpatientDO updateOutpatient(String outpatientId,String diseaseCode,String diseaseName,String medicalState){
    public WlyyOutpatientDO updateOutpatient(String outpatientId,String diseaseCode,String diseaseName,String medicalState,String isDisease){
            WlyyOutpatientDO outpatientDO = outpatientDao.findById(outpatientId);
            if (StringUtils.isNoneBlank(diseaseCode)){
                outpatientDO.setDiseaseCode(diseaseCode);
                outpatientDO.setDiseaseName(diseaseName);
                outpatientDO.setIsDisease(isDisease);
            }
            if (StringUtils.isNoneBlank(medicalState)){
                outpatientDO.setMedicalState(medicalState);

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

@@ -311,6 +311,18 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
    private String visitType;//就诊类型：1首诊2复诊
    private String virusFlag;//新冠病毒：1阴性、2阳性、0无
    private String isDisease;//特殊病种1是0否
    @Column(name = "is_disease")
    public String getIsDisease() {
        return isDisease;
    }
    public void setIsDisease(String isDisease) {
        this.isDisease = isDisease;
    }
    @Column(name = "visit_type")
    public String getVisitType() {
        return visitType;

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

@@ -731,6 +731,8 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                    @RequestParam(value = "outPatientId", required = true) String outPatientId,
                                    @ApiParam(name = "advice", value = "医嘱")
                                    @RequestParam(value = "advice", required = false) String advice,
                                    @ApiParam(name = "isDisease", value = "是否特殊病种1是0否")
                                        @RequestParam(value = "isDisease", required = false) String isDisease,
                                    @ApiParam(name = "diseaseCode", value = "特殊病种")
                                        @RequestParam(value = "diseaseCode", required = false) String diseaseCode,
                                    @ApiParam(name = "diseaseName", value = "特殊病种名称")
@@ -751,7 +753,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                    @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,diseaseCode,diseaseName);
        Map<String, Object> result = prescriptionService.makeDiagnosis(outPatientId, prescriptionId, advice, type, infoJsons, diagnosisJson, inspectionJson, emrJson, hisId,diseaseCode,diseaseName,isDisease);
        try {
            com.alibaba.fastjson.JSONObject msgObj = new com.alibaba.fastjson.JSONObject();
@@ -3778,6 +3780,8 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    public Envelop updateOupatient(
            @ApiParam(name = "outpatientId", value = "门诊id")
            @RequestParam(value = "outpatientId", required = false) String outpatientId,
            @ApiParam(name = "idDisease", value = "是否是特殊病种1是0否")
            @RequestParam(value = "idDisease", required = false) String idDisease,
            @ApiParam(name = "diseaseCode", value = "特殊病种code")
            @RequestParam(value = "diseaseCode", required = false) String diseaseCode,
            @ApiParam(name = "diseaseName", value = "特殊病种名称")
@@ -3785,7 +3789,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "medicalState", value = "是否医保01")
            @RequestParam(value = "medicalState", required = false) String medicalState) {
        try {
            return success("操作成功", prescriptionService.updateOutpatient(outpatientId,diseaseCode,diseaseName,medicalState));
            return success("操作成功", prescriptionService.updateOutpatient(outpatientId,diseaseCode,diseaseName,medicalState,idDisease));
        } catch (Exception e) {
            return Envelop.getError(e.getMessage());
        }