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

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

@@ -42,7 +42,7 @@ public interface PrescriptionDao extends PagingAndSortingRepository<WlyyPrescrip
    @Transactional
    @Modifying
    @Query("update WlyyPrescriptionDO p set p.status=?1 ,p.finishTime =?2 where p.outpatientId=?3")
    @Query("update WlyyPrescriptionDO p set p.status=?1 ,p.finishTime =?2 where p.outpatientId=?3 and p.status>=30")
    void updateStatusByOutPatientId(Integer status, Date date,String id);
    @Query("select a from WlyyPrescriptionDO a where a.outpatientId = ?1 and a.checkStatus <>4 order by a.createTime desc ")

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

@@ -3635,8 +3635,10 @@ public class EntranceService {
                            YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByLog_no(resultJSON.getString("xtgzh0"));
                            List<WlyyPrescriptionDO> prescriptionDOList = prescriptionDao.findByRealOrderAndStatusList(resultJSON.getString("xtgzh0"));
                            String diseaseCode = "";
                            String diseaseName = "";
                            if (prescriptionDOList!=null&&prescriptionDOList.size()!=0){
                                diseaseCode= prescriptionDOList.get(0).getDiseaseCode();
                                diseaseName = prescriptionDOList.get(0).getDiseaseName();
                            }
                            List<YlzMedicalIcdDO> icdDOList = new ArrayList<>();
@@ -3673,6 +3675,7 @@ public class EntranceService {
                                ylzMedicalRelationDO.setDataSource("53");
                                ylzMedicalRelationDO.setBalance(cardFee+"");
                                ylzMedicalRelationDO.setDiseaseCode(diseaseCode);
                                ylzMedicalRelationDO.setDiseaseName(diseaseName);
                                ylzMedicalRelationDO.setPreCount(resultJSON.getString("cfxms0"));
                                BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(outpatientDO.getDoctor());
                                if (baseDoctorDO!=null){
@@ -3808,6 +3811,7 @@ public class EntranceService {
                                ylzMedicalRelationDO.setOrgCode("3502000303");
                                ylzMedicalRelationDO.setRegionCode("350200");
                                ylzMedicalRelationDO.setDiseaseCode(diseaseCode);
                                ylzMedicalRelationDO.setDiseaseName(diseaseName);
                                ylzMedicalRelationDO.setIdcard(outpatientDO.getIdcard());
                                ylzMedicalRelationDO.setName(resultJSON.getString("xming0"));
                                ylzMedicalRelationDO.setCertType("01");
@@ -3986,8 +3990,10 @@ public class EntranceService {
                                YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByLog_no(resultJSON.getString("xtgzh0"));
                                List<WlyyPrescriptionDO> prescriptionDOList = prescriptionDao.findByRealOrderAndStatusList(resultJSON.getString("xtgzh0"));
                                String diseaseCode = "";
                                String diseaseName = "";
                                if (prescriptionDOList!=null&&prescriptionDOList.size()!=0){
                                    diseaseCode= prescriptionDOList.get(0).getDiseaseCode();
                                    diseaseName = prescriptionDOList.get(0).getDiseaseName();
                                }
                                List<YlzMedicalIcdDO> icdDOList = new ArrayList<>();
@@ -4024,6 +4030,7 @@ public class EntranceService {
                                    ylzMedicalRelationDO.setDataSource("53");
                                    ylzMedicalRelationDO.setBalance(cardFee+"");
                                    ylzMedicalRelationDO.setDiseaseCode(diseaseCode);
                                    ylzMedicalRelationDO.setDiseaseName(diseaseName);
                                    ylzMedicalRelationDO.setPreCount(resultJSON.getString("cfxms0"));
                                    BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(outpatientDO.getDoctor());
                                    if (baseDoctorDO!=null){
@@ -4159,6 +4166,7 @@ public class EntranceService {
                                    ylzMedicalRelationDO.setOrgCode("3502000303");
                                    ylzMedicalRelationDO.setRegionCode("350200");
                                    ylzMedicalRelationDO.setDiseaseCode(diseaseCode);
                                    ylzMedicalRelationDO.setDiseaseName(diseaseName);
                                    ylzMedicalRelationDO.setIdcard(outpatientDO.getIdcard());
                                    ylzMedicalRelationDO.setName(resultJSON.getString("xming0"));
                                    ylzMedicalRelationDO.setCertType("01");
@@ -4368,8 +4376,10 @@ public class EntranceService {
                    YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findByLog_no(resultJSON.getString("xtgzh0"));
                    List<WlyyPrescriptionDO> prescriptionDOList = prescriptionDao.findByRealOrderAndStatusList(resultJSON.getString("xtgzh0"));
                    String diseaseCode = "";
                    String diseaseName = "";
                    if (prescriptionDOList!=null&&prescriptionDOList.size()!=0){
                        diseaseCode= prescriptionDOList.get(0).getDiseaseCode();
                        diseaseName = prescriptionDOList.get(0).getDiseaseName();
                    }
                    List<YlzMedicalIcdDO> icdDOList = new ArrayList<>();
                    List<YlzMedicalMxDO> mxDOList = new ArrayList<>();
@@ -4405,6 +4415,7 @@ public class EntranceService {
                        ylzMedicalRelationDO.setDataSource("53");
                        ylzMedicalRelationDO.setBalance(cardFee+"");
                        ylzMedicalRelationDO.setDiseaseCode(diseaseCode);
                        ylzMedicalRelationDO.setDiseaseName(diseaseName);
                        ylzMedicalRelationDO.setPreCount(resultJSON.getString("cfxms0"));
                        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(outpatientDO.getDoctor());
                        if (baseDoctorDO!=null){
@@ -4540,6 +4551,7 @@ public class EntranceService {
                        ylzMedicalRelationDO.setOrgCode("3502000303");
                        ylzMedicalRelationDO.setRegionCode("350200");
                        ylzMedicalRelationDO.setDiseaseCode(diseaseCode);
                        ylzMedicalRelationDO.setDiseaseName(diseaseName);
                        ylzMedicalRelationDO.setIdcard(outpatientDO.getIdcard());
                        ylzMedicalRelationDO.setName(resultJSON.getString("xming0"));
                        ylzMedicalRelationDO.setCertType("01");

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/healthCare/YlzMedicalRelationDO.java

@@ -66,6 +66,7 @@ public class YlzMedicalRelationDO extends UuidIdentityEntity {
    private String detailSerial;//医保明细流水号
    private Integer status;//结算状态
    private String diseaseCode;//病种编码
    private String diseaseName;//病种名称
    private String treatmentType;//人员待遇类别
    private String treatmentTypeName;//人员待遇类别名称
    private String treatmentStatus;//医疗待遇状态
@@ -101,6 +102,7 @@ public class YlzMedicalRelationDO extends UuidIdentityEntity {
    private String outJson;//海沧his需要
    public String getOutJson() {
        return outJson;
    }
@@ -635,6 +637,14 @@ public class YlzMedicalRelationDO extends UuidIdentityEntity {
        this.diseaseCode = diseaseCode;
    }
    public String getDiseaseName() {
        return diseaseName;
    }
    public void setDiseaseName(String diseaseName) {
        this.diseaseName = diseaseName;
    }
    public String getTreatmentType() {
        return treatmentType;
    }