线上bug处理

business/base-service/src/main/java/com/yihu/jw/article/service/KnowledgeArticleDictService.java

@@ -164,9 +164,7 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
            // 新增
            knowledgeArticleDO.setId(UUID.randomUUID().toString().replace("-", ""));
            knowledgeArticleDO.setCreateTime(new Date());
            knowledgeArticleDO.setStatus(0);
            knowledgeArticleDO.setReleaseStatus(0);
            knowledgeArticleDO.setDel(1);
            knowledgeArticleDO.setType(type);
@@ -178,7 +176,6 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
            if (knowledgeArticleDO.getReleaseTime() == null) {
                knowledgeArticleDO.setReleaseTime(new Date());
            }
            if (type == 1) {
                BaseDoctorDO userDO = doctorDao.findById(knowledgeArticleDO.getCreateUser()).orElse(null);
                if (userDO != null) {
@@ -190,13 +187,10 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
                    knowledgeArticleDO.setCreateUserName(userDO.getName());
                }
            }
            if (!articleNeedCheck) {
                knowledgeArticleDO.setStatus(1);
                knowledgeArticleDO.setReleaseStatus(1);
            }
            knowledgeArticleDO = knowledgeArticleDictDao.save(knowledgeArticleDO);
            return knowledgeArticleDO;
        } else {
@@ -223,6 +217,7 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
            one.setVedioUrl(knowledgeArticleDO.getVedioUrl());
            one.setRecommendDoctor(knowledgeArticleDO.getRecommendDoctor());
            one.setRecommendDoctorName(knowledgeArticleDO.getRecommendDoctorName());
            if (!articleNeedCheck) {
                one.setStatus(1);
                one.setReleaseStatus(1);

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

@@ -1274,16 +1274,16 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
    public JSONArray selectHistoryEmrFromEntrance(String patientId,String eventNo) throws Exception {
       JSONArray array =dsyyEntranceService.selectHistoryEmrFromEntrance(patientId,eventNo);
       JSONArray jsonArray = new JSONArray();
       for (int i=0;i<array.size();i++){
           JSONObject object = array.getJSONObject(i);
           String PATIENT = object.getString("PATIENT");
           String OPID = object.getString("OPID");
           String res = selectHistoryEmrRecord(PATIENT,OPID);
           if (StringUtils.isNoneBlank(res)&&!res.equalsIgnoreCase("[]")){
               jsonArray.add(object);
           }
       }
       return jsonArray;
//       for (int i=0;i<array.size();i++){
//           JSONObject object = array.getJSONObject(i);
//           String PATIENT = object.getString("PATIENT");
//           String OPID = object.getString("OPID");
//           String res = selectHistoryEmrRecord(PATIENT,OPID);
//           if (StringUtils.isNoneBlank(res)&&!res.equalsIgnoreCase("[]")){
//               jsonArray.add(object);
//           }
//       }
       return array;
    }

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

@@ -47,6 +47,7 @@ import com.yihu.jw.entity.hospital.dict.WlyyChargeDictDO;
import com.yihu.jw.entity.hospital.doctor.WlyyDoctorOnlineTimeDO;
import com.yihu.jw.entity.hospital.doctor.WlyyDoctorWorkTimeDO;
import com.yihu.jw.entity.hospital.doctor.WlyyPatientRegisterTimeDO;
import com.yihu.jw.entity.hospital.family.WlyyPatientFamilyMemberDO;
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalMxDO;
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalRelationDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
@@ -69,6 +70,7 @@ import com.yihu.jw.hospital.doctor.dao.DoctorWorkTimeDao;
import com.yihu.jw.hospital.doctor.dao.PatientRegisterTimeDao;
import com.yihu.jw.hospital.doctor.dao.WlyyDoctorOnlineTimeDao;
import com.yihu.jw.hospital.drugstore.dao.BaseDrugStoreDao;
import com.yihu.jw.hospital.family.dao.WlyyPatientFamilyMemberDao;
import com.yihu.jw.hospital.healthCare.YlzMedicailMxDao;
import com.yihu.jw.hospital.healthCare.YlzMedicailRelationDao;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
@@ -372,7 +374,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    private HealthCareNewService healthCareNewService;
    @Autowired
    private BasePatientAddressInfoDao addressInfoDao;
    @Autowired
    private WlyyPatientFamilyMemberDao familyMemberDao;
    //已就诊医生列表
    public PageEnvelop visitedDoctorPage(String patientId,String startTime,String endTime,Integer page,Integer size){
        String sql = "SELECT d.id,d.name,d.job_title_name jobTitleName,o.dept_name deptName,d.photo,date_format(MAX(o.create_time),'%Y-%m-%d %H:%i:%S' )" +
@@ -16072,4 +16075,50 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        return object;
    }
    public void initPatientAfter() throws Exception {
        String sql = "select * from base_patient_temp ";
        List<Map<String,Object>> maps = jdbcTemplate.queryForList(sql);
        for (Map<String,Object> map:maps){
            String idcard =map.get("idcard").toString();
            String name = map.get("name").toString();
            String mobile = map.get("mobile")==null?null:map.get("mobile").toString();
            BasePatientDO patientDO =  basePatientDao.findByIdcardAndDel(idcard,"1");
            if(StringUtils.isNotBlank(idcard)&&patientDO == null){
                BasePatientDO patient = new BasePatientDO();
                String salt = UUID.randomUUID().toString().substring(0,5);
                String pw = null;
                pw = idcard.substring(idcard.length()-6);
                patient.setIdcard(idcard);
                patient.setName(name);
                patient.setMobile(mobile);
                patient.setPassword(MD5.md5Hex(pw + "{" + salt + "}"));
                patient.setSalt(salt);
                patient.setDel("1");
                patient.setEnabled(1);
                patient.setLocked(0);
                patient.setSex(Integer.parseInt(com.yihu.jw.util.idcard.IdCardUtil.getSexForIdcard_new(idcard)));
                patient.setCreateTime(new Date());
                patient.setUpdateTime(new Date());
                patient.setBirthday(DateUtil.strToDate(com.yihu.jw.util.idcard.IdCardUtil.getBirthdayForIdcardStr(idcard),"yyyyMMdd"));
                patientDO = basePatientDao.save(patient);
                WlyyPatientFamilyMemberDO basePatientFamilyMemberDO = familyMemberDao.findFamilyMemberByPatientAndRelationCode(patientDO.getId(),"7");
                if (basePatientFamilyMemberDO==null){
                    basePatientFamilyMemberDO = new WlyyPatientFamilyMemberDO();
                    basePatientFamilyMemberDO.setPatient(patientDO.getId());
                    basePatientFamilyMemberDO.setFamilyRelation("7");
                    basePatientFamilyMemberDO.setFamilyRelationName("自己");
                    basePatientFamilyMemberDO.setCardType("身份证");
                    basePatientFamilyMemberDO.setCardNo(patientDO.getIdcard());
                    basePatientFamilyMemberDO.setCreateTime(new Date());
                    basePatientFamilyMemberDO.setUpdateTime(new Date());
                    basePatientFamilyMemberDO.setIsAuthorize(1);
                    basePatientFamilyMemberDO.setIsDel(1);
                    basePatientFamilyMemberDO.setFamilyMember(patientDO.getId());
                    familyMemberDao.save(basePatientFamilyMemberDO);
                }
            }
        }
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -479,11 +479,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            @RequestParam(value = "consultDeptFlag", required = false) String consultDeptFlag)  {
        try {
            List<DictHospitalDeptDO> res =  hospitalDeptService.getHosDeptByCode(orgCode,consultDeptFlag,name);
            if(res != null && res.size() > 0 ){
                return  success(res);
            }else{
                return success("无法获取该机构的部门列表信息！");
            }
            return  success(res);
        }catch (Exception e){
            return  failedException2(e);
        }
@@ -500,11 +496,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            @RequestParam(value = "saasId", required = false) String saasId)  {
        try {
            List<DictJobTitleDO> res= baseDictJobTitleService.getBySaasId(saasId);
            if(res != null && res.size() > 0 ){
                return  success(res);
            }else{
                return success("无法获取该机构的职称信息！");
            }
            return  success(res);
        }catch (Exception e){
            return  failedException2(e);
        }

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

@@ -3984,5 +3984,13 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        return success("操作成功", dsyyPrescriptionService.getPersonInfoByCode(ehealthCode));
    }
    @GetMapping("/initPatientAfter")
    @ApiOperation(value = "初始化诊后患者数据", notes = "初始化诊后患者数据")
    public Envelop initPatientAfter() throws Exception {
        prescriptionService.initPatientAfter();
        return success("操作成功");
    }
}