中山优化

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

@@ -2796,6 +2796,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            prescriptionDO.setDoctor(outpatientDO.getDoctor());
            prescriptionDO.setDoctorName(outpatientDO.getDoctorName());
            prescriptionDO.setPayStatus(0);
            prescriptionDO.setIsDisease(isDisease);
            prescriptionDO.setDiseaseCode(diseaseCode);
            prescriptionDO.setDiseaseName(diseaseName);
            if (wechatId.equalsIgnoreCase("xm_ykyy_wx")) {
                prescriptionDO.setAdmNo(outpatientDO.getAdmNo());
            }
@@ -15221,7 +15224,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                            return object;
                        }
                    }else {
                        if (outpatientDO.getIsDisease().equalsIgnoreCase("1")){
                        if (StringUtils.isNoneBlank(ylzMedicalRelationDO.getDiseaseCode())){
                            object.put("code","403");
                            object.put("message","特殊病种已经结算过，请联系医院处理！");
                            return object;
@@ -15231,7 +15234,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    }
                }else {
                    if (jsonObject.getString("flag").equalsIgnoreCase("50204")){
                        if (outpatientDO.getIsDisease().equalsIgnoreCase("1")){
                        if (StringUtils.isNoneBlank(ylzMedicalRelationDO.getDiseaseCode())){
                            object.put("code","403");
                            object.put("message","特殊病种已经结算过，请联系医院处理！");
                            return object;
@@ -16682,12 +16685,17 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @param medicalState
     * @return
     */
    public WlyyOutpatientDO updateOutpatient(String outpatientId,String diseaseCode,String diseaseName,String medicalState,String isDisease){
    public WlyyOutpatientDO updateOutpatient(String outpatientId,String prescriptionId,String diseaseCode,String diseaseName,String medicalState,String isDisease){
            WlyyOutpatientDO outpatientDO = outpatientDao.findById(outpatientId);
            outpatientDO.setIsDisease(isDisease);
            outpatientDO.setDiseaseCode(diseaseCode);
            outpatientDO.setDiseaseName(diseaseName);
            outpatientDO.setMedicalState(medicalState);
            WlyyPrescriptionDO prescriptionDO = prescriptionDao.findOne(prescriptionId);
            prescriptionDO.setIsDisease(isDisease);
            prescriptionDO.setDiseaseCode(diseaseCode);
            prescriptionDO.setDiseaseName(diseaseName);
            prescriptionDao.save(prescriptionDO);
            return outpatientDao.save(outpatientDO);
    }

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

@@ -3633,8 +3633,12 @@ public class EntranceService {
                    net.sf.json.JSONObject resultJSON = msgInfoJson.getJSONObject("receipt");
                    if (resultJSON!=null){
                        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByLog_no(resultJSON.getString("xtgzh0"));
                        List<WlyyPrescriptionDO> prescriptionDOS = prescriptionDao.findByRealOrderAndStatusList(resultJSON.getString("xtgzh0"));
                        String diseaseCode = outpatientDO.getDiseaseCode();
                        List<WlyyPrescriptionDO> prescriptionDOList = prescriptionDao.findByRealOrderAndStatusList(resultJSON.getString("xtgzh0"));
                        String diseaseCode = "";
                        if (prescriptionDOList!=null&&prescriptionDOList.size()!=0){
                            diseaseCode= prescriptionDOList.get(0).getDiseaseCode();
                        }
                        List<YlzMedicalIcdDO> icdDOList = new ArrayList<>();
                        List<YlzMedicalMxDO> mxDOList = new ArrayList<>();
                        if (ylzMedicalRelationDO==null){

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

@@ -285,6 +285,39 @@ public class WlyyPrescriptionDO extends UuidIdentityEntity {
    private Date disableTime;
    private String diseaseCode;//特殊病种编码
    private String diseaseName;//特殊病种名称
    private String isDisease;//特殊病种1是0否
    @Column(name = "disease_code")
    public String getDiseaseCode() {
        return diseaseCode;
    }
    public void setDiseaseCode(String diseaseCode) {
        this.diseaseCode = diseaseCode;
    }
    @Column(name = "disease_name")
    public String getDiseaseName() {
        return diseaseName;
    }
    public void setDiseaseName(String diseaseName) {
        this.diseaseName = diseaseName;
    }
    @Column(name = "is_disease")
    public String getIsDisease() {
        return isDisease;
    }
    public void setIsDisease(String isDisease) {
        this.isDisease = isDisease;
    }
    @Column(name = "check_time")
    public Date getCheckTime() {

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionVO.java

@@ -403,6 +403,40 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty(value = "单据号", example = "模块1")
    private String voucherNo;
    @ApiModelProperty(value = "特殊病种编码", example = "模块1")
    private String diseaseCode;//特殊病种编码
    @ApiModelProperty(value = "特殊病种名称", example = "模块1")
    private String diseaseName;//特殊病种名称
    @ApiModelProperty(value = "特殊病种1是0否", example = "模块1")
    private String isDisease;//特殊病种1是0否
    public String getDiseaseCode() {
        return diseaseCode;
    }
    public void setDiseaseCode(String diseaseCode) {
        this.diseaseCode = diseaseCode;
    }
    public String getDiseaseName() {
        return diseaseName;
    }
    public void setDiseaseName(String diseaseName) {
        this.diseaseName = diseaseName;
    }
    public String getIsDisease() {
        return isDisease;
    }
    public void setIsDisease(String isDisease) {
        this.isDisease = isDisease;
    }
    public String getVoucherNo() {
        return voucherNo;
    }

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

@@ -3818,6 +3818,8 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    public Envelop updateOupatient(
            @ApiParam(name = "outpatientId", value = "门诊id")
            @RequestParam(value = "outpatientId", required = false) String outpatientId,
            @ApiParam(name = "prescriptionId", value = "处方id")
            @RequestParam(value = "prescriptionId", required = false) String prescriptionId,
            @ApiParam(name = "isDisease", value = "是否是特殊病种1是0否")
            @RequestParam(value = "isDisease", required = false) String isDisease,
            @ApiParam(name = "diseaseCode", value = "特殊病种code")
@@ -3827,7 +3829,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,isDisease));
            return success("操作成功", prescriptionService.updateOutpatient(outpatientId,prescriptionId,diseaseCode,diseaseName,medicalState,isDisease));
        } catch (Exception e) {
            return Envelop.getError(e.getMessage());
        }