diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java index b30f786..4430df8 100644 --- a/src/main/java/com/emr/controller/ArchiveOtherExtController.java +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -107,18 +107,18 @@ public class ArchiveOtherExtController { return Msg.fail("masterId不能为空!"); } } - if (StringUtils.isNotBlank(dzblIds)) { - List list = Arrays.asList(dzblIds.split(",")); - for (String taskid : list) { - HttpRequest.sendGet("http://200.100.104.40:9296/api/noviewtask/MakeUp", "taskid=" + taskid); - } - } - if (StringUtils.isNotBlank(nursingIds)) { - List list = Arrays.asList(nursingIds.split(",")); - for (String taskid : list) { - HttpRequest.sendGet("http://200.100.104.40:9296/api/noviewtask/MakeUp", "taskid=" + taskid); - } - } +// if (StringUtils.isNotBlank(dzblIds)) { +// List list = Arrays.asList(dzblIds.split(",")); +// for (String taskid : list) { +// HttpRequest.sendGet("http://200.100.104.40:9296/api/noviewtask/MakeUp", "taskid=" + taskid); +// } +// } +// if (StringUtils.isNotBlank(nursingIds)) { +// List list = Arrays.asList(nursingIds.split(",")); +// for (String taskid : list) { +// HttpRequest.sendGet("http://200.100.104.40:9296/api/noviewtask/MakeUp", "taskid=" + taskid); +// } +// } archiveOtherExtService.updateSubmit(ids, notNursingIds, nursingIds, detailIds, jzh, masterId, sysFlag, request); return Msg.success(); } diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index 9499c37..a74ba68 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -18,6 +18,8 @@ public interface Archive_MasterMapper { Archive_Master selectByPrimaryKey(String id); + List selectCommonlyUsed(String idList); + List selectByCol(Archive_Master_Vo record); List selectByColumn(Archive_Master_Vo record); @@ -30,6 +32,8 @@ public interface Archive_MasterMapper { int updateByClo(Archive_Master record); + int deleteRecordByInp(@Param("masterId")String masterId); + int updateById(Archive_Master record); List getDoctorFileInfo(@Param("deptCode")String deptCode,@Param("doctor")String doctor,@Param("startTime")String startTime,@Param("endTime")String endTime); diff --git a/src/main/java/com/emr/entity/Archive_Master.java b/src/main/java/com/emr/entity/Archive_Master.java index aa32c48..f36f09e 100644 --- a/src/main/java/com/emr/entity/Archive_Master.java +++ b/src/main/java/com/emr/entity/Archive_Master.java @@ -13,6 +13,16 @@ public class Archive_Master { private String name; + public String getDeptNameCode() { + return deptNameCode; + } + + public void setDeptNameCode(String deptNameCode) { + this.deptNameCode = deptNameCode; + } + + private String deptNameCode; + private String sex; private String deptName; diff --git a/src/main/java/com/emr/entity/CommomVo.java b/src/main/java/com/emr/entity/CommomVo.java new file mode 100644 index 0000000..b56901a --- /dev/null +++ b/src/main/java/com/emr/entity/CommomVo.java @@ -0,0 +1,1921 @@ +package com.emr.vo; + +import lombok.Data; + +import java.math.BigDecimal; +@Data +public class CommomVo { + private String patientId; + + + private String admissTimes;//住院次数 + + private String inpatientNo;//病案号 + + private String name;//姓名 + + private String admissId;//住院号 + + public void setAdmissTimes(String admissTimes) { + this.admissTimes = admissTimes; + } + + public void setAge(String age) { + this.age = age; + } + + public void setAgeMonth(String ageMonth) { + this.ageMonth = ageMonth; + } + + private String sex;//性别 + + private String age;//年龄(岁) + + private String ageMonth;//年龄(月) + + private Short ageDay;//年龄(天) + + private String homeAddr;//家庭住址 + + private String nameCym;//姓名简写 + + private String admissDate;//住院日期 + + private String disDate;//出院日期 + + private Integer admissDays;//住院天数 + + private String disDept;//出院科室 + + private String isOper;//是否手术 + + private String attending;//主治医师 + + private String mainDiagCode;//主要诊断编码 + + private String mainDiagName;//主要诊断名称 + + private String mainDisThing;//主要诊断转归情况 + + private String memo;//病案备注 + + private String country;//国籍 + + private String birthAddr;//出生地 + + private String idCard;//身份证号 + + private String job;//职业 + + private String marriage;//婚况 + + private String homeTel;//家庭电话 + + private String homeZip;//家庭邮编 + + private String workName;//单位名称 + + private String workAddr;//工作地址 + + private String workTel;//工作电话 + + private String workZip;//工作邮编 + + private String linkman;//联系人 + + private String relation;//与联系人关系 + + private String relAddr;//联系人地址 + + private String relTel;//联系人电话 + + private String payType;//付费方式 + + private String birthday;//出生日期 + + private BigDecimal avoirdupois;//新生儿出生体重 + + private String admissType;//住院方式 + + private String admissDept;//住院科室 + + private String admissWard;//住院病房 + + private String changeDept;//转科科室 + + private String disWard;//出院病房 + + private String clinicDiag;//门诊诊断编码 + + private String clinicName;//门诊诊断名称 + + private String admissThing;//入院病情(暂无用) + + private String pathologyCode;//病理诊断编码 + + private String pathologyNo;//病理号 + + private String pathologyName;//病理诊断 + + private String medicine;//过敏药物 + + private String isMedicine;//是否药物过敏 + + private String emitPathology;//是否尸亡尸检 + + private String deptDirector;//科主任 + + private String director;//主任(副主任)医师 + + private String admissDoctor;//住院医师 + + private String refresher;//进修医师 + + private String praxis;//实习医师 + + private String coding;//编码员 + + private String quality;//病案质量 + + private String control;//质控医师 + + private String nurses;//质控护士 + + private String qualityDate;//质控日期 + + private String inputName;//输入员 + + private String inputCreateTime;//输入时间 + + private String bloodType;//血型 + + private String rh;//RH + + private Integer isShowDetail=0;//是否通过审批且时间未过期可查看 + + private Integer isDownload=0;//是否通过审批且时间未过期可下载 + + private Integer lockStatus=0;//锁定状态 + + private Integer editOper=0;//可修改 + + private Integer delOper=0;//可删除 + + private String diagCode;//诊断编号 + + private String diagName;//诊断名称 + + private String disThing;//转归情况 + + private String operateCode;//手术编码 + + private String operateName;//手术名称 + + private String operateDate;//手术时间 + + private String operator;//术者 + + private String assistant1;//助I + + private String assistant2;//助II + + private String operateClass;//手术级别 + + private String anaesthesiaType;//麻醉方式 + + private String cut;//切口愈合等级 + + private String anaesthesiaName;//麻醉医师 + + private String taintName;//院内感染病名 + + private String otherDiagName;//其他诊断的名称 + + private String admissTimesName;//住院次数中文 + + private Integer unlockOper;//解锁权限 + + private Integer borrowingOper;//申请借阅权限 + + private Integer downloadOper;//下载pdf权限 + + private Integer lockOper;//锁定权限 + + private String nativePlace;//籍贯 + + private String addr;//现住址 + + private String telphone;//手机号 + + private String zip;//现住址邮编 + + private String changeDate1;//转科1日期 + + private String changeDate2;//转科2日期 + + private String changeDate3;//转科3日期 + + private String changeDept1;//转科1 + + private String changeDept2;//转科2 + + private String changeDept3;//转科3 + + private String isHospitalization;//是否30天后再住院 + + private String hospitalizationObjective;//再住院目的 + + private Integer ryqhmDays;//颅脑损伤患者入院前昏迷天数 + + private Integer ryqhmHours;//颅脑损伤患者入院前昏迷小时数 + + private Integer ryqhmMins;//颅脑损伤患者入院前昏迷分钟数 + + private Integer ryhmDays;//颅脑损伤患者入院后昏迷天数 + + private Integer ryhmHours;//颅脑损伤患者入院后昏迷小时数 + + private Integer ryhmMins;//颅脑损伤患者入院后昏迷分钟数 + + private String isMedicalRecordPath;//是否有临床路径病例 + + private String responsibleNurse;//责任护士 + + private String birthWeight;//婴儿出生体重 + + private String breathing;//呼吸 + + private Integer rescueTimes;//抢救次数 + + private Integer rescueSuccessTimes;//抢救成功次数 + + private String tumorStagingType;//肿瘤分期类型 + + private String radiotherapyType;//放疗方式 + + private String radiotherapyProgram;//放疗程式 + + private String radiotherapyDevice;//放疗装置 + + private Integer primaryTumorDay;//放疗服药期间天数 + + private Integer primaryTumorTimes;//放疗服药期间每天次数 + + private String primaryTumorDose;//放疗服药期间每次剂量 + + private String primaryTumorStarttime;//放疗服药起始时间 + + private String primaryTumorEndtime;//放疗服药终止时间 + + private String chemotherapyType;//化疗方式 + + private String chemotherapyMethod;//化疗方法 + + private String startTime; + + private String endTime; + + private String drugNameAndDose; + + private String treatmentCourse; + + private String curativeEffect; + + private String caseType;//病历分型 + + private BigDecimal totalCharge;//住院总费用 + + private BigDecimal charge02;//护理费 + + private BigDecimal charge03;//西药费 + + private BigDecimal charge04;//中成药费 + + private BigDecimal charge05;//中草药费 + + private BigDecimal charge09;//血费 + + private BigDecimal charge10;//一般医疗服务费 + + private BigDecimal charge14;//麻醉费 + + private BigDecimal charge19;//手术费 + + private BigDecimal charge20;//综合医疗服务其他费用 + + private BigDecimal charge22;//自付金额 + + private BigDecimal charge25;//一般治疗操作费 + + private BigDecimal other;//其他费 + + private BigDecimal charge29;//病理诊断费 + + private BigDecimal charge30;//实验室诊断费 + + private BigDecimal charge31;//影像学诊断费 + + private BigDecimal charge32;//临床诊断项目费 + + private BigDecimal charge33;//非手术治疗项目费 + + private BigDecimal charge34;//临床物理治疗费 + + private BigDecimal charge35;//手术治疗项目总费用 + + private BigDecimal charge36;//康复费 + + private BigDecimal charge37;//抗菌药物费用 + + private BigDecimal charge38;//中医治疗费 + + private BigDecimal charge39;//白蛋白类制品费 + + private BigDecimal charge40;//球蛋白类制品费 + + private BigDecimal charge41;//凝血因子类制品费 + + private BigDecimal charge42;//细胞因子类制品费 + + private BigDecimal charge43;//检查用一次性医用材料费 + + private BigDecimal charge44;//治疗用一次性医用材料费 + + private BigDecimal charge45;//手术用一次性医用材料费 + + private String childbirthMothed;//分娩结果 + + private String diagType;//诊断类型 + + private String nation;//民族 + + private String clinicDoctor;//门诊医生 + + private String disType;//出院方式 + + private String transferHospitalName;//离院方式为医嘱转院，拟接收医疗机构名称 + + private String transferHealcenterName;//离院方式为转社区卫生服务器机构/乡镇卫生院，拟接收医疗机构名称 + + private BigDecimal birthbabyWeight;//新生儿入院体重 + + private String healthyCard;//健康卡号 + + private String saveTimes;//抢救次数 + + private String saveSuccessTimes;//抢救成功次数 + + private String chossurg;//是否择期手术 + + private String babyDiagType;//婴儿转归 + + private String checkedDatetime;// + + private String babySex; + + private String filePath;//脐血库、祈福医院影像图片目录 + + private String newPath;//新增图片目录 + + private String ph;//病历扫描盘号 + + private String gdh;//胶卷上的目录 + + private String clinicHerbDiag;//中医门诊icd + + private String clinicHerbName;//中医门诊病名 + + private String admissHerbDiag;//中医入院icd + + private String admissHerbName;//中医入院病名 + + private String admissDiag;//入院诊断idc + + private String admissName;//入院诊断名称 + + private String affirmDate;//确诊日期 + + private Integer delCount;//病案图片已删除的个数 + + private String paperPosition;//纸质位置 + + private String printStatus;//打印状态 + + + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getPaperPosition() { + return paperPosition; + } + + public void setPaperPosition(String paperPosition) { + this.paperPosition = paperPosition; + } + + public Integer getDelCount() { + return delCount; + } + + public void setDelCount(Integer delCount) { + this.delCount = delCount; + } + + public String getAffirmDate() { + return affirmDate; + } + + public void setAffirmDate(String affirmDate) { + this.affirmDate = affirmDate; + } + + public String getClinicHerbDiag() { + return clinicHerbDiag; + } + + public void setClinicHerbDiag(String clinicHerbDiag) { + this.clinicHerbDiag = clinicHerbDiag; + } + + public String getClinicHerbName() { + return clinicHerbName; + } + + public void setClinicHerbName(String clinicHerbName) { + this.clinicHerbName = clinicHerbName; + } + + public String getAdmissHerbDiag() { + return admissHerbDiag; + } + + public void setAdmissHerbDiag(String admissHerbDiag) { + this.admissHerbDiag = admissHerbDiag; + } + + public String getAdmissHerbName() { + return admissHerbName; + } + + public void setAdmissHerbName(String admissHerbName) { + this.admissHerbName = admissHerbName; + } + + public String getAdmissDiag() { + return admissDiag; + } + + public void setAdmissDiag(String admissDiag) { + this.admissDiag = admissDiag; + } + + public String getAdmissName() { + return admissName; + } + + public void setAdmissName(String admissName) { + this.admissName = admissName; + } + + public String getPh() { + return ph; + } + + public void setPh(String ph) { + this.ph = ph; + } + + public String getGdh() { + return gdh; + } + + public void setGdh(String gdh) { + this.gdh = gdh; + } + + public String getMainDiagCode() { + return mainDiagCode; + } + + public void setMainDiagCode(String mainDiagCode) { + this.mainDiagCode = mainDiagCode; + } + + public String getMemo() { + return memo; + } + + public void setMemo(String memo) { + this.memo = memo; + } + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } + + public String getNewPath() { + return newPath; + } + + public void setNewPath(String newPath) { + this.newPath = newPath; + } + + public String getTransferHospitalName() { + return transferHospitalName; + } + + public void setTransferHospitalName(String transferHospitalName) { + this.transferHospitalName = transferHospitalName; + } + + public String getTransferHealcenterName() { + return transferHealcenterName; + } + + public void setTransferHealcenterName(String transferHealcenterName) { + this.transferHealcenterName = transferHealcenterName; + } + + public String getPathologyNo() { + return pathologyNo; + } + + public void setPathologyNo(String pathologyNo) { + this.pathologyNo = pathologyNo; + } + + public String getPathologyCode() { + return pathologyCode; + } + + public void setPathologyCode(String pathologyCode) { + this.pathologyCode = pathologyCode; + } + + public String getInputCreateTime() { + return inputCreateTime; + } + + public void setInputCreateTime(String inputCreateTime) { + this.inputCreateTime = inputCreateTime; + } + + public String getInputName() { + return inputName; + } + + public void setInputName(String inputName) { + this.inputName = inputName; + } + + public String getWorkName() { + return workName; + } + + public void setWorkName(String workName) { + this.workName = workName; + } + + public String getPathologyName() { + return pathologyName; + } + + public void setPathologyName(String pathologyName) { + this.pathologyName = pathologyName; + } + + public String getSaveTimes() { + return saveTimes; + } + + public String getHealthyCard() { + return healthyCard; + } + + public void setHealthyCard(String healthyCard) { + this.healthyCard = healthyCard; + } + + public void setSaveTimes(String saveTimes) { + this.saveTimes = saveTimes; + } + + public String getSaveSuccessTimes() { + return saveSuccessTimes; + } + + public void setSaveSuccessTimes(String saveSuccessTimes) { + this.saveSuccessTimes = saveSuccessTimes; + } + + public String getBabySex() { + return babySex; + } + + public void setBabySex(String babySex) { + this.babySex = babySex; + } + + public String getCheckedDatetime() { + return checkedDatetime; + } + + public void setCheckedDatetime(String checkedDatetime) { + this.checkedDatetime = checkedDatetime; + } + + public String getBabyDiagType() { + return babyDiagType; + } + + public void setBabyDiagType(String babyDiagType) { + this.babyDiagType = babyDiagType; + } + + public String getChossurg() { + return chossurg; + } + + public void setChossurg(String chossurg) { + this.chossurg = chossurg; + } + + public BigDecimal getBirthbabyWeight() { + return birthbabyWeight; + } + + public void setBirthbabyWeight(BigDecimal birthbabyWeight) { + this.birthbabyWeight = birthbabyWeight; + } + + public String getNativePlace() { + return nativePlace; + } + + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getAddr() { + return addr; + } + + public void setAddr(String addr) { + this.addr = addr; + } + + public String getTelphone() { + return telphone; + } + + public void setTelphone(String telphone) { + this.telphone = telphone; + } + + public String getZip() { + return zip; + } + + public void setZip(String zip) { + this.zip = zip; + } + + public String getChangeDate1() { + return changeDate1; + } + + public void setChangeDate1(String changeDate1) { + this.changeDate1 = changeDate1; + } + + public String getChangeDate2() { + return changeDate2; + } + + public void setChangeDate2(String changeDate2) { + this.changeDate2 = changeDate2; + } + + public String getChangeDate3() { + return changeDate3; + } + + public void setChangeDate3(String changeDate3) { + this.changeDate3 = changeDate3; + } + + public String getChangeDept1() { + return changeDept1; + } + + public void setChangeDept1(String changeDept1) { + this.changeDept1 = changeDept1; + } + + public String getChangeDept2() { + return changeDept2; + } + + public void setChangeDept2(String changeDept2) { + this.changeDept2 = changeDept2; + } + + public String getChangeDept3() { + return changeDept3; + } + + public void setChangeDept3(String changeDept3) { + this.changeDept3 = changeDept3; + } + + public String getIsHospitalization() { + return isHospitalization; + } + + public void setIsHospitalization(String isHospitalization) { + this.isHospitalization = isHospitalization; + } + + public String getHospitalizationObjective() { + return hospitalizationObjective; + } + + public void setHospitalizationObjective(String hospitalizationObjective) { + this.hospitalizationObjective = hospitalizationObjective; + } + + public Integer getRyqhmDays() { + return ryqhmDays; + } + + public void setRyqhmDays(Integer ryqhmDays) { + this.ryqhmDays = ryqhmDays; + } + + public Integer getRyqhmHours() { + return ryqhmHours; + } + + public void setRyqhmHours(Integer ryqhmHours) { + this.ryqhmHours = ryqhmHours; + } + + public Integer getRyqhmMins() { + return ryqhmMins; + } + + public void setRyqhmMins(Integer ryqhmMins) { + this.ryqhmMins = ryqhmMins; + } + + public Integer getRyhmDays() { + return ryhmDays; + } + + public void setRyhmDays(Integer ryhmDays) { + this.ryhmDays = ryhmDays; + } + + public Integer getRyhmHours() { + return ryhmHours; + } + + public void setRyhmHours(Integer ryhmHours) { + this.ryhmHours = ryhmHours; + } + + public Integer getRyhmMins() { + return ryhmMins; + } + + public void setRyhmMins(Integer ryhmMins) { + this.ryhmMins = ryhmMins; + } + + public String getIsMedicalRecordPath() { + return isMedicalRecordPath; + } + + public void setIsMedicalRecordPath(String isMedicalRecordPath) { + this.isMedicalRecordPath = isMedicalRecordPath; + } + + public String getResponsibleNurse() { + return responsibleNurse; + } + + public void setResponsibleNurse(String responsibleNurse) { + this.responsibleNurse = responsibleNurse; + } + + public String getBirthWeight() { + return birthWeight; + } + + public void setBirthWeight(String birthWeight) { + this.birthWeight = birthWeight; + } + + public String getBreathing() { + return breathing; + } + + public void setBreathing(String breathing) { + this.breathing = breathing; + } + + public Integer getRescueTimes() { + return rescueTimes; + } + + public void setRescueTimes(Integer rescueTimes) { + this.rescueTimes = rescueTimes; + } + + public Integer getRescueSuccessTimes() { + return rescueSuccessTimes; + } + + public void setRescueSuccessTimes(Integer rescueSuccessTimes) { + this.rescueSuccessTimes = rescueSuccessTimes; + } + + public String getTumorStagingType() { + return tumorStagingType; + } + + public void setTumorStagingType(String tumorStagingType) { + this.tumorStagingType = tumorStagingType; + } + + public String getRadiotherapyType() { + return radiotherapyType; + } + + public void setRadiotherapyType(String radiotherapyType) { + this.radiotherapyType = radiotherapyType; + } + + public String getRadiotherapyProgram() { + return radiotherapyProgram; + } + + public void setRadiotherapyProgram(String radiotherapyProgram) { + this.radiotherapyProgram = radiotherapyProgram; + } + + public String getRadiotherapyDevice() { + return radiotherapyDevice; + } + + public void setRadiotherapyDevice(String radiotherapyDevice) { + this.radiotherapyDevice = radiotherapyDevice; + } + + public Integer getPrimaryTumorDay() { + return primaryTumorDay; + } + + public void setPrimaryTumorDay(Integer primaryTumorDay) { + this.primaryTumorDay = primaryTumorDay; + } + + public Integer getPrimaryTumorTimes() { + return primaryTumorTimes; + } + + public void setPrimaryTumorTimes(Integer primaryTumorTimes) { + this.primaryTumorTimes = primaryTumorTimes; + } + + public String getPrimaryTumorDose() { + return primaryTumorDose; + } + + public void setPrimaryTumorDose(String primaryTumorDose) { + this.primaryTumorDose = primaryTumorDose; + } + + public String getPrimaryTumorStarttime() { + return primaryTumorStarttime; + } + + public void setPrimaryTumorStarttime(String primaryTumorStarttime) { + this.primaryTumorStarttime = primaryTumorStarttime; + } + + public String getPrimaryTumorEndtime() { + return primaryTumorEndtime; + } + + public void setPrimaryTumorEndtime(String primaryTumorEndtime) { + this.primaryTumorEndtime = primaryTumorEndtime; + } + + public String getChemotherapyType() { + return chemotherapyType; + } + + public void setChemotherapyType(String chemotherapyType) { + this.chemotherapyType = chemotherapyType; + } + + public String getChemotherapyMethod() { + return chemotherapyMethod; + } + + public void setChemotherapyMethod(String chemotherapyMethod) { + this.chemotherapyMethod = chemotherapyMethod; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDrugNameAndDose() { + return drugNameAndDose; + } + + public void setDrugNameAndDose(String drugNameAndDose) { + this.drugNameAndDose = drugNameAndDose; + } + + public String getTreatmentCourse() { + return treatmentCourse; + } + + public void setTreatmentCourse(String treatmentCourse) { + this.treatmentCourse = treatmentCourse; + } + + public String getCurativeEffect() { + return curativeEffect; + } + + public void setCurativeEffect(String curativeEffect) { + this.curativeEffect = curativeEffect; + } + + public String getCaseType() { + return caseType; + } + + public void setCaseType(String caseType) { + this.caseType = caseType; + } + + public BigDecimal getTotalCharge() { + return totalCharge; + } + + public void setTotalCharge(BigDecimal totalCharge) { + this.totalCharge = totalCharge; + } + + public BigDecimal getCharge02() { + return charge02; + } + + public void setCharge02(BigDecimal charge02) { + this.charge02 = charge02; + } + + public BigDecimal getCharge03() { + return charge03; + } + + public void setCharge03(BigDecimal charge03) { + this.charge03 = charge03; + } + + public BigDecimal getCharge04() { + return charge04; + } + + public void setCharge04(BigDecimal charge04) { + this.charge04 = charge04; + } + + public BigDecimal getCharge05() { + return charge05; + } + + public void setCharge05(BigDecimal charge05) { + this.charge05 = charge05; + } + + public BigDecimal getCharge09() { + return charge09; + } + + public void setCharge09(BigDecimal charge09) { + this.charge09 = charge09; + } + + public BigDecimal getCharge10() { + return charge10; + } + + public void setCharge10(BigDecimal charge10) { + this.charge10 = charge10; + } + + public BigDecimal getCharge14() { + return charge14; + } + + public void setCharge14(BigDecimal charge14) { + this.charge14 = charge14; + } + + public BigDecimal getCharge19() { + return charge19; + } + + public void setCharge19(BigDecimal charge19) { + this.charge19 = charge19; + } + + public BigDecimal getCharge20() { + return charge20; + } + + public void setCharge20(BigDecimal charge20) { + this.charge20 = charge20; + } + + public BigDecimal getCharge22() { + return charge22; + } + + public void setCharge22(BigDecimal charge22) { + this.charge22 = charge22; + } + + public BigDecimal getCharge25() { + return charge25; + } + + public void setCharge25(BigDecimal charge25) { + this.charge25 = charge25; + } + + public BigDecimal getOther() { + return other; + } + + public void setOther(BigDecimal other) { + this.other = other; + } + + public BigDecimal getCharge29() { + return charge29; + } + + public void setCharge29(BigDecimal charge29) { + this.charge29 = charge29; + } + + public BigDecimal getCharge30() { + return charge30; + } + + public void setCharge30(BigDecimal charge30) { + this.charge30 = charge30; + } + + public BigDecimal getCharge31() { + return charge31; + } + + public void setCharge31(BigDecimal charge31) { + this.charge31 = charge31; + } + + public BigDecimal getCharge32() { + return charge32; + } + + public void setCharge32(BigDecimal charge32) { + this.charge32 = charge32; + } + + public BigDecimal getCharge33() { + return charge33; + } + + public void setCharge33(BigDecimal charge33) { + this.charge33 = charge33; + } + + public BigDecimal getCharge34() { + return charge34; + } + + public void setCharge34(BigDecimal charge34) { + this.charge34 = charge34; + } + + public BigDecimal getCharge35() { + return charge35; + } + + public void setCharge35(BigDecimal charge35) { + this.charge35 = charge35; + } + + public BigDecimal getCharge36() { + return charge36; + } + + public void setCharge36(BigDecimal charge36) { + this.charge36 = charge36; + } + + public BigDecimal getCharge37() { + return charge37; + } + + public void setCharge37(BigDecimal charge37) { + this.charge37 = charge37; + } + + public BigDecimal getCharge38() { + return charge38; + } + + public void setCharge38(BigDecimal charge38) { + this.charge38 = charge38; + } + + public BigDecimal getCharge39() { + return charge39; + } + + public void setCharge39(BigDecimal charge39) { + this.charge39 = charge39; + } + + public BigDecimal getCharge40() { + return charge40; + } + + public void setCharge40(BigDecimal charge40) { + this.charge40 = charge40; + } + + public BigDecimal getCharge41() { + return charge41; + } + + public void setCharge41(BigDecimal charge41) { + this.charge41 = charge41; + } + + public BigDecimal getCharge42() { + return charge42; + } + + public void setCharge42(BigDecimal charge42) { + this.charge42 = charge42; + } + + public BigDecimal getCharge43() { + return charge43; + } + + public void setCharge43(BigDecimal charge43) { + this.charge43 = charge43; + } + + public BigDecimal getCharge44() { + return charge44; + } + + public void setCharge44(BigDecimal charge44) { + this.charge44 = charge44; + } + + public BigDecimal getCharge45() { + return charge45; + } + + public void setCharge45(BigDecimal charge45) { + this.charge45 = charge45; + } + + public String getChildbirthMothed() { + return childbirthMothed; + } + + public void setChildbirthMothed(String childbirthMothed) { + this.childbirthMothed = childbirthMothed; + } + + public String getDiagType() { + return diagType; + } + + public void setDiagType(String diagType) { + this.diagType = diagType; + } + + public String getNation() { + return nation; + } + + public void setNation(String nation) { + this.nation = nation; + } + + public String getClinicDoctor() { + return clinicDoctor; + } + + public void setClinicDoctor(String clinicDoctor) { + this.clinicDoctor = clinicDoctor; + } + + public String getDisType() { + return disType; + } + + public void setDisType(String disType) { + this.disType = disType; + } + + public Integer getUnlockOper() { + return unlockOper; + } + + public void setUnlockOper(Integer unlockOper) { + this.unlockOper = unlockOper; + } + + public Integer getBorrowingOper() { + return borrowingOper; + } + + public void setBorrowingOper(Integer borrowingOper) { + this.borrowingOper = borrowingOper; + } + + public Integer getLockOper() { + return lockOper; + } + + public void setLockOper(Integer lockOper) { + this.lockOper = lockOper; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + + + public String getInpatientNo() { + return inpatientNo; + } + + public void setInpatientNo(String inpatientNo) { + this.inpatientNo = inpatientNo; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAdmissId() { + return admissId; + } + + public void setAdmissId(String admissId) { + this.admissId = admissId; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + + public Short getAgeDay() { + return ageDay; + } + + public void setAgeDay(Short ageDay) { + this.ageDay = ageDay; + } + + public String getHomeAddr() { + return homeAddr; + } + + public void setHomeAddr(String homeAddr) { + this.homeAddr = homeAddr; + } + + public String getNameCym() { + return nameCym; + } + + public void setNameCym(String nameCym) { + this.nameCym = nameCym; + } + + public String getAdmissDate() { + return admissDate; + } + + public void setAdmissDate(String admissDate) { + this.admissDate = admissDate; + } + + public String getDisDate() { + return disDate; + } + + public void setDisDate(String disDate) { + this.disDate = disDate; + } + + public Integer getAdmissDays() { + return admissDays; + } + + public void setAdmissDays(Integer admissDays) { + this.admissDays = admissDays; + } + + public String getDisDept() { + return disDept; + } + + public void setDisDept(String disDept) { + this.disDept = disDept; + } + + public String getIsOper() { + return isOper; + } + + public void setIsOper(String isOper) { + this.isOper = isOper; + } + + public String getAttending() { + return attending; + } + + public void setAttending(String attending) { + this.attending = attending; + } + + public String getMainDiagName() { + return mainDiagName; + } + + public void setMainDiagName(String mainDiagName) { + this.mainDiagName = mainDiagName; + } + + public String getMainDisThing() { + return mainDisThing; + } + + public void setMainDisThing(String mainDisThing) { + this.mainDisThing = mainDisThing; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getBirthAddr() { + return birthAddr; + } + + public void setBirthAddr(String birthAddr) { + this.birthAddr = birthAddr; + } + + public String getIdCard() { + return idCard; + } + + public void setIdCard(String idCard) { + this.idCard = idCard; + } + + public String getJob() { + return job; + } + + public void setJob(String job) { + this.job = job; + } + + public String getMarriage() { + return marriage; + } + + public void setMarriage(String marriage) { + this.marriage = marriage; + } + + public String getHomeTel() { + return homeTel; + } + + public void setHomeTel(String homeTel) { + this.homeTel = homeTel; + } + + public String getHomeZip() { + return homeZip; + } + + public void setHomeZip(String homeZip) { + this.homeZip = homeZip; + } + + public String getWorkAddr() { + return workAddr; + } + + public void setWorkAddr(String workAddr) { + this.workAddr = workAddr; + } + + public String getWorkTel() { + return workTel; + } + + public void setWorkTel(String workTel) { + this.workTel = workTel; + } + + public String getWorkZip() { + return workZip; + } + + public void setWorkZip(String workZip) { + this.workZip = workZip; + } + + public String getLinkman() { + return linkman; + } + + public void setLinkman(String linkman) { + this.linkman = linkman; + } + + public String getRelation() { + return relation; + } + + public void setRelation(String relation) { + this.relation = relation; + } + + public String getRelAddr() { + return relAddr; + } + + public void setRelAddr(String relAddr) { + this.relAddr = relAddr; + } + + public String getRelTel() { + return relTel; + } + + public void setRelTel(String relTel) { + this.relTel = relTel; + } + + public String getPayType() { + return payType; + } + + public void setPayType(String payType) { + this.payType = payType; + } + + public String getBirthday() { + return birthday; + } + + public void setBirthday(String birthday) { + this.birthday = birthday; + } + + public BigDecimal getAvoirdupois() { + return avoirdupois; + } + + public void setAvoirdupois(BigDecimal avoirdupois) { + this.avoirdupois = avoirdupois; + } + + public String getAdmissType() { + return admissType; + } + + public void setAdmissType(String admissType) { + this.admissType = admissType; + } + + public String getAdmissDept() { + return admissDept; + } + + public void setAdmissDept(String admissDept) { + this.admissDept = admissDept; + } + + public String getAdmissWard() { + return admissWard; + } + + public void setAdmissWard(String admissWard) { + this.admissWard = admissWard; + } + + public String getChangeDept() { + return changeDept; + } + + public void setChangeDept(String changeDept) { + this.changeDept = changeDept; + } + + public String getDisWard() { + return disWard; + } + + public void setDisWard(String disWard) { + this.disWard = disWard; + } + + public String getClinicDiag() { + return clinicDiag; + } + + public void setClinicDiag(String clinicDiag) { + this.clinicDiag = clinicDiag; + } + + public String getClinicName() { + return clinicName; + } + + public void setClinicName(String clinicName) { + this.clinicName = clinicName; + } + + public String getAdmissThing() { + return admissThing; + } + + public void setAdmissThing(String admissThing) { + this.admissThing = admissThing; + } + + public String getMedicine() { + return medicine; + } + + public void setMedicine(String medicine) { + this.medicine = medicine; + } + + public String getIsMedicine() { + return isMedicine; + } + + public void setIsMedicine(String isMedicine) { + this.isMedicine = isMedicine; + } + + public String getEmitPathology() { + return emitPathology; + } + + public void setEmitPathology(String emitPathology) { + this.emitPathology = emitPathology; + } + + public String getDeptDirector() { + return deptDirector; + } + + public void setDeptDirector(String deptDirector) { + this.deptDirector = deptDirector; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getAdmissDoctor() { + return admissDoctor; + } + + public void setAdmissDoctor(String admissDoctor) { + this.admissDoctor = admissDoctor; + } + + public String getRefresher() { + return refresher; + } + + public void setRefresher(String refresher) { + this.refresher = refresher; + } + + public String getPraxis() { + return praxis; + } + + public void setPraxis(String praxis) { + this.praxis = praxis; + } + + public String getCoding() { + return coding; + } + + public void setCoding(String coding) { + this.coding = coding; + } + + public String getQuality() { + return quality; + } + + public void setQuality(String quality) { + this.quality = quality; + } + + public String getControl() { + return control; + } + + public void setControl(String control) { + this.control = control; + } + + public String getNurses() { + return nurses; + } + + public void setNurses(String nurses) { + this.nurses = nurses; + } + + public String getQualityDate() { + return qualityDate; + } + + public void setQualityDate(String qualityDate) { + this.qualityDate = qualityDate; + } + + public String getBloodType() { + return bloodType; + } + + public void setBloodType(String bloodType) { + this.bloodType = bloodType; + } + + public String getRh() { + return rh; + } + + public void setRh(String rh) { + this.rh = rh; + } + + public Integer getIsShowDetail() { + return isShowDetail; + } + + public void setIsShowDetail(Integer isShowDetail) { + this.isShowDetail = isShowDetail; + } + + public Integer getLockStatus() { + return lockStatus; + } + + public void setLockStatus(Integer lockStatus) { + this.lockStatus = lockStatus; + } + + public String getDiagCode() { + return diagCode; + } + + public void setDiagCode(String diagCode) { + this.diagCode = diagCode; + } + + public String getDiagName() { + return diagName; + } + + public void setDiagName(String diagName) { + this.diagName = diagName; + } + + public String getDisThing() { + return disThing; + } + + public void setDisThing(String disThing) { + this.disThing = disThing; + } + + public String getOperateCode() { + return operateCode; + } + + public void setOperateCode(String operateCode) { + this.operateCode = operateCode; + } + + public String getOperateName() { + return operateName; + } + + public void setOperateName(String operateName) { + this.operateName = operateName; + } + + public String getOperateDate() { + return operateDate; + } + + public void setOperateDate(String operateDate) { + this.operateDate = operateDate; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + public String getAssistant1() { + return assistant1; + } + + public void setAssistant1(String assistant1) { + this.assistant1 = assistant1; + } + + public String getAssistant2() { + return assistant2; + } + + public void setAssistant2(String assistant2) { + this.assistant2 = assistant2; + } + + public String getOperateClass() { + return operateClass; + } + + public void setOperateClass(String operateClass) { + this.operateClass = operateClass; + } + + public String getAnaesthesiaType() { + return anaesthesiaType; + } + + public void setAnaesthesiaType(String anaesthesiaType) { + this.anaesthesiaType = anaesthesiaType; + } + + public String getCut() { + return cut; + } + + public void setCut(String cut) { + this.cut = cut; + } + + public String getAnaesthesiaName() { + return anaesthesiaName; + } + + public void setAnaesthesiaName(String anaesthesiaName) { + this.anaesthesiaName = anaesthesiaName; + } + + public String getTaintName() { + return taintName; + } + + public void setTaintName(String taintName) { + this.taintName = taintName; + } + + public String getOtherDiagName() { + return otherDiagName; + } + + public void setOtherDiagName(String otherDiagName) { + this.otherDiagName = otherDiagName; + } + + public String getAdmissTimesName() { + return admissTimesName; + } + + public void setAdmissTimesName(String admissTimesName) { + this.admissTimesName = admissTimesName; + } + + public Integer getDownloadOper() { + return downloadOper; + } + + public void setDownloadOper(Integer downloadOper) { + this.downloadOper = downloadOper; + } + + public Integer getIsDownload() { + return isDownload; + } + + public void setIsDownload(Integer isDownload) { + this.isDownload = isDownload; + } + + public Integer getEditOper() { + return editOper; + } + + public void setEditOper(Integer editOper) { + this.editOper = editOper; + } + + public Integer getDelOper() { + return delOper; + } + + public void setDelOper(Integer delOper) { + this.delOper = delOper; + } +} \ No newline at end of file diff --git a/src/main/java/com/emr/service/ipml/ArchiveCallbackInfoService.java b/src/main/java/com/emr/service/ipml/ArchiveCallbackInfoService.java index 71a9a35..187acba 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveCallbackInfoService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveCallbackInfoService.java @@ -2,6 +2,7 @@ package com.emr.service.ipml; import com.emr.dao.ArchiveCallbackInfoMapper; import com.emr.dao.ArchiveFlowRoleMapper; +import com.emr.dao.Archive_MasterMapper; import com.emr.entity.ArchiveCallbackInfo; import com.emr.entity.ArchiveFlowRole; import com.emr.entity.Archive_Master; @@ -47,6 +48,8 @@ public class ArchiveCallbackInfoService { @Autowired private Archive_MasterService archiveMasterService; @Autowired + private Archive_MasterMapper archive_masterMapper; + @Autowired private ArchiveFlowInfoService archiveFlowInfoService; @Autowired private CommomService commomService; @@ -80,6 +83,7 @@ public class ArchiveCallbackInfoService { List archiveFlowRoles = flowRoleMapper.selectAll(); List currentRoleAndNextRole = archiveFlowInfoService.getCurrentRoleAndNextRole(currentCode,targetCode,archiveFlowRoles); archiveFlowInfoService.insertFlowInfo(masterId,remark,currentRoleAndNextRole.get(0),currentRoleAndNextRole.get(1),new Date()); + archive_masterMapper.deleteRecordByInp(masterId); } private String getAddressIp() throws Exception{ diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index bacf2d0..f594f50 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -13,6 +13,7 @@ import com.emr.service.Emr_Fault_DetailService; import com.emr.util.ExceptionPrintUtil; import com.emr.util.Msg; import com.emr.util.OracleConnect; +import com.emr.vo.CommomVo; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; @@ -354,7 +355,16 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { for (Archive_Master_Vo masterVo : list) { String archivestate = masterVo.getArchivestate(); String inpNo = masterVo.getPatientId(); - String sql = "SELECT FISZH FROM V_JSWZH_EMR_CALLBACK WHERE JZH='"+inpNo+"'"; + String sql=null; + if (archiveMasterVo.getCallBackStatus().equals("1")) { + sql = "SELECT FISZH FROM V_JSWZH_EMR_CALLBACK WHERE JZH='" + inpNo + "' AND FISZH='已召回' "; + } + if (archiveMasterVo.getCallBackStatus().equals("0")) { + sql = "SELECT FISZH FROM V_JSWZH_EMR_CALLBACK WHERE JZH='" + inpNo + "' AND FISZH !='已召回'"; + } + if (archiveMasterVo.getCallBackStatus().equals("")) { + sql = "SELECT FISZH FROM V_JSWZH_EMR_CALLBACK WHERE JZH='" + inpNo + "'"; + } try { String select = OracleConnect.select(sql); masterVo.setHisStatic(select); @@ -371,7 +381,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //组织已经审核的状态 archivestate = EnumVerify.DocState.GetStepName(status, role.getCode()); //组织未审核的状态 - String currentArchivestate = EnumVerify.DocState.GetCurrentStepName(status, role.getCode(),qualitySwitch); + String currentArchivestate = EnumVerify.DocState.GetCurrentStepName(status, role.getCode(), qualitySwitch); masterVo.setStatus(archivestate); masterVo.setCurrentStatus(currentArchivestate); //根据角色 @@ -1280,9 +1290,23 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { String[] idList = ids.split(","); String patientId = master.getPatientId(); String[] patientIdList = patientId.split(","); + CommomVo commomVo = new CommomVo(); List archiveFlowRoles = flowRoleMapper.selectAll(); for (int i = 0; i < idList.length; i++) { String id = idList[i]; + List archive_masterVos = archiveMasterMapper.selectCommonlyUsed(id); + for (Archive_Master list : archive_masterVos) { + commomVo.setPatientId(list.getId()); + commomVo.setAdmissTimes(list.getVisitId()); + commomVo.setInpatientNo(list.getIdNo()); + commomVo.setName(list.getName()); + commomVo.setAdmissId(list.getPatientId()); + commomVo.setSex(list.getSex()); + commomVo.setAdmissDate(list.getAdmissionDateTime()); + commomVo.setDisDate(list.getDischargeDateTime()); + commomVo.setDisDept(list.getDeptNameCode()); + commomVo.setAttending(list.getDoctorInCharge()); + } if (StringUtils.isNotBlank(id)) { //修改病案归档状态 Archive_Master archiveMaster = new Archive_Master(); diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index d0bef52..c6d135f 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -1109,6 +1109,9 @@ delete from archive_master where id = #{id,jdbcType=NVARCHAR} + + DELETE FROM commomtable WHERE patient_id = #{masterId} + insert into archive_master (id, patient_id, inp_no, visit_id, name, sex, @@ -1626,6 +1629,13 @@ + SELECT b.ID diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList1.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList1.jsp index 28e264f..09a79e7 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList1.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList1.jsp @@ -225,11 +225,11 @@ diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/timeLine.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/timeLine.jsp index ed1df32..3770bbc 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/timeLine.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/timeLine.jsp @@ -68,80 +68,247 @@ - + <%----%> + <%----%> + <%--
--%> + <%----%> + <%--
--%> + <%--
--%> + <%--
    --%> + <%----%> + <%----%> + <%--
  • --%> + <%----%> + <%----%> + <%----%> + <%--
    • --%> + <%--
  • --%> + <%----%> + <%--<%counterFunction();%>--%> + <%--
    --%> + <%--扣除假日后用时 ${info.useTime}--%> + <%--

    --%> + <%--${info.userName}--%> + <%--${info.sumbitName}--%> + <%----%> + <%----%> + <%--审核不通过--%> + <%----%> + <%----%> + <%--审核通过--%> + <%----%> + <%----%> + <%--

    --%> + <%----%> + <%----%> + <%--
    --%> + <%----%> + <%--

    缺陷选项:${info.faultAssortName}

    --%> + <%--    --%> + <%----%> + <%--

    缺陷信息内容:${info.content}

    --%> + <%--    --%> + <%----%> + <%--

    退回信息内容:${info.backContent}

    --%> + <%--    --%> + <%--
    --%> + <%--    --%> + <%----%> + <%----%> + <%--
    --%> + <%--审核答复:${info.remark}--%> + <%--
    --%> + <%--    --%> + <%--    --%> + <%--    --%> + <%--
    --%> + <%--
    • --%> + <%--    --%> + <%--    --%> + <%----%> + <%--
  • --%> + <%----%> + <%--${master.dischargeDateTime}--%> + <%----%> + <%--
    • --%> + <%--
  • --%> + <%----%> + <%--
    --%> + <%--

    出院日期

    --%> + <%--
    --%> + <%--
    • --%> + <%--
--%> + <%--
--%> + <%--
--%> + <%--
--%> + <%----%> + + + + -
- -
-
-
    - - -
  • +
    +
    +
    +

    医生审核

    +
    + +
    +
    +
      + + +
    • -
      • -
    • - - <%counterFunction();%> -
      - 扣除假日后用时 ${info.useTime} -

      - ${info.userName} - ${info.sumbitName} +

      • +
    • + + <%counterFunction();%> +
      + 扣除假日后用时 ${info.useTime} +

      + ${info.userName} + ${info.sumbitName} + + + 审核不通过 + + + 审核通过 + + +

      - 审核不通过 +
      + +

      缺陷选项:${info.faultAssortName}

      +       + +

      缺陷信息内容:${info.content}

      +       + +

      退回信息内容:${info.backContent}

      +       +
      - 审核通过 + +
      + 审核答复:${info.remark} +
      +       - - - -
      - -

      缺陷选项:${info.faultAssortName}

      -       - -

      缺陷信息内容:${info.content}

      -       - -

      退回信息内容:${info.backContent}

      -       -
      -       - - -
      - 审核答复:${info.remark} +
      +
      • +       +       + +
    • + + ${master.dischargeDateTime} + +
      • +
    • + +
      +

      出院日期

      +
      +
      • +
    +
    +
    +
    +
    +
    +
    +
    +

    护士审核

    +
    + +
    +
    +
      + + +
    • + + + +
      • +
    • + + <%counterFunction1();%> +
      + 扣除假日后用时 ${info.useTime} +

      + ${info.userName} + ${info.sumbitName} + + + 审核不通过 + + + 审核通过 + + +

      + + +
      + +

      缺陷选项:${info.faultAssortName}

      +       + +

      缺陷信息内容:${info.content}

      +       + +

      退回信息内容:${info.backContent}

      +
      - - -       -
      -
      • -       -       - -
    • + + + +
      + 审核答复:${info.remark} +
      +       +       + +
    +
    • +     +     + +
  • ${master.dischargeDateTime} -
    • -
  • - -
    -

    出院日期

    -
    -
    • -
+ +
  • + +
    +

    出院日期

    +
    +
    • + +
    - -
    + +     + + + + + + +
    diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js index e425571..bd6c51f 100644 --- a/src/main/webapp/static/js/beHospList/beHospList.js +++ b/src/main/webapp/static/js/beHospList/beHospList.js @@ -3,12 +3,13 @@ var tipLoad = 1; var selects = ''; //定义表格内容最大高度 var maxHeight = 0; + //出院列表 function initTable() { if (tipLoad == 1) { $("#table").bootstrapTable({ // 对应table标签的id - url: path+"/beHosp/beHospList", // 获取表格数据的url - uniqueId:"id", + url: path + "/beHosp/beHospList", // 获取表格数据的url + uniqueId: "id", contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据 cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true striped: true, //是否显示行间隔色 @@ -64,16 +65,16 @@ function initTable() { startDateTo: $("#startDateTo").val(), endDateTo: $("#endDateTo").val(), deptName: getDeptNameForQuery(), - doctorInCharge:getSelecteds('doctorInCharge'), - isSearch:$("#isSearch").val(), - status:$("#currentRoleIds").val(), - role:$("#currentRole").val(), - roles:$("#searchOperRole").val(), - isSuccess:$("#isSuccessSearch").val(), - infoId:$("#infoId").val(), - operRole:$("#checker").val(), - callBackStatus:$("#callBackStatus").val(), - printStatus:$("#printStatus").val() + doctorInCharge: getSelecteds('doctorInCharge'), + isSearch: $("#isSearch").val(), + status: $("#currentRoleIds").val(), + role: $("#currentRole").val(), + roles: $("#searchOperRole").val(), + isSuccess: $("#isSuccessSearch").val(), + infoId: $("#infoId").val(), + operRole: $("#checker").val(), + callBackStatus: $("#callBackStatus").val(), + printStatus: $("#printStatus").val() }; return temp; }, @@ -135,17 +136,17 @@ function initTable() { field: 'status', align: 'center', valign: 'middle', - formatter:paramsMatter + formatter: paramsMatter }, { title: '是否完整', field: 'lockinfo', align: 'center', valign: 'middle', - formatter:function(value, row){ - if(value == '完整'){ + formatter: function (value, row) { + if (value == '完整') { return '是'; - }else{ + } else { return '否'; } } @@ -155,11 +156,11 @@ function initTable() { field: 'hisStatic', align: 'center', valign: 'middle', - formatter:function(value, row){ - var hisStatic = row.hisStatic; - if(hisStatic == '已召回'){ - return ''+hisStatic+''; - }else{ + formatter: function (value, row) { + var callBackStatus = row.callBackStatus; + if (callBackStatus == '召回完成' ||callBackStatus == '召回中') { + return '已召回'; + } else { return '否'; } } @@ -169,10 +170,10 @@ function initTable() { field: 'printStatus', align: 'center', valign: 'middle', - formatter:function(value, row){ - if(value == '是'){ + formatter: function (value, row) { + if (value == '是') { return '是'; - }else{ + } else { return '否'; } } @@ -208,9 +209,9 @@ function initTable() { var result = 1; //result = selectHis(row); if (result == 1) { - } else if(result == -1){ + } else if (result == -1) { toastr.warning("系统出错了请联系系统管理员"); - }else { + } else { toastr.warning('医生或护士未提交数据，请稍后再试'); } $('#selModal').modal({ @@ -239,7 +240,7 @@ function initTable() { $("#chargeLab").html(row.doctorInCharge); $("#deptToLab").html(row.deptAdmissionTo); //出院 - if(row.dischargeDateTime!=null&& row.dischargeDateTime!='') { + if (row.dischargeDateTime != null && row.dischargeDateTime != '') { $("#inDateLab1").html(operDisTime(row.dischargeDateTime)); } $("#deptToLab1").html(row.deptName); @@ -251,7 +252,7 @@ function initTable() { $("#masterId").val(row.id); //赋值总费用 var d1 = row.d1; - if(d1 != null){ + if (d1 != null) { d1 = d1.toFixed(2); $("#d1").text(d1); } @@ -263,7 +264,7 @@ function initTable() { outDate = row.admissionDateTime.split("-"); } $("#outDateLab").val(outDate[0] + "" + outDate[1] + "" + row.inpNo.trim() + "" + row.visitId + ""); - initTree(row.id,$("#checker").val()); + initTree(row.id, $("#checker").val()); getSource(); }, //查看流程 @@ -278,7 +279,7 @@ function initTable() { var inpNo = row.inpNo; var visitId = row.visitId; var dischargeDateTime = row.dischargeDateTime; - $("#showFlowInfoIframe").prop("src",path+"/beHosp/toShowFlowInfo?id="+masterId+"&name="+name+"&inpNo="+inpNo+"&visitId="+visitId+"&dischargeDateTime="+dischargeDateTime+"&role="+$("#checker").val()); + $("#showFlowInfoIframe").prop("src", path + "/beHosp/toShowFlowInfo?id=" + masterId + "&name=" + name + "&inpNo=" + inpNo + "&visitId=" + visitId + "&dischargeDateTime=" + dischargeDateTime + "&role=" + $("#checker").val()); }, //跨科查阅 'click .showTransferDeptUser': function (e, value, row) { @@ -290,7 +291,7 @@ function initTable() { var masterId = row.id; var deptName = row.deptName; $("#masterId1").val(masterId); - initTree2(deptName,masterId); + initTree2(deptName, masterId); }, }, cellStyle: function () { @@ -309,6 +310,7 @@ function initTable() { }); } } + //确认批量审批列表 function initTable3() { $("#table3").bootstrapTable("destroy"); @@ -317,9 +319,9 @@ function initTable3() { cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true striped: true, //是否显示行间隔色 pagination: true, // 在表格底部显示分页组件，默认false - pageSize:"5", + pageSize: "5", sidePagination: 'client', - pageList: [5,10,20,50,100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。 + pageList: [5, 10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。 undefinedText: '---', //当数据为 undefined 时显示的字符 height: 230, //定义表格的高度。 paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 @@ -375,6 +377,7 @@ function initTable3() { } }); } + //审批存在不完整列表 function initTable4(data) { $("#table4").bootstrapTable("destroy"); @@ -384,8 +387,8 @@ function initTable4(data) { striped: true, //是否显示行间隔色 pagination: true, // 在表格底部显示分页组件，默认false sidePagination: 'client', - pageSize:"5", - pageList: [5,10,20,50,100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。 + pageSize: "5", + pageList: [5, 10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。 undefinedText: '---', //当数据为 undefined 时显示的字符 height: 230, //定义表格的高度。 paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 @@ -433,7 +436,7 @@ function initTable4(data) { field: 'unSuccessAssortNames', align: 'left', formatter: function (value) { - return ''+value+''; + return '' + value + ''; } } ], @@ -444,22 +447,24 @@ function initTable4(data) { } }); } + //格式化状态 function paramsMatter(value, row) { var result = ''; - if(row.days > 0){ + if (row.days > 0) { result = '(超期)'; } - if(value == null){ + if (value == null) { value = ''; } - if(result != '') { - return '

    ' + result + row.currentStatus + '

    '; + if (result != '') { + return '

    ' + result + row.currentStatus + '

    '; } return value; } + //审核弹窗 单个审批① -function verifyInfo(role,archivestate,roleCode,masterId,patientId){ +function verifyInfo(role, archivestate, roleCode, masterId, patientId) { //生成表单token,防止表单重复提交 setFormToken(); //赋值审批一个 @@ -479,18 +484,19 @@ function verifyInfo(role,archivestate,roleCode,masterId,patientId){ $("#roleCode").val(roleCode); $("#archivestate").val(archivestate); $("#role").val(role); - } else if(result == -1){ + } else if (result == -1) { toastr.warning("系统出错了请联系系统管理员"); - }else { + } else { toastr.warning("his系统医生或护士未完成提交"); } } + //提交审核 单个审批② 批量审批③ $("#verifyBtn").on('click', function () { $("#verifyModal").modal('hide'); $("#resultLabel1").text(''); var approveCount = $("#approveCount").val(); - if(approveCount > 1) { + if (approveCount > 1) { //大于一个弹出确认框 $("#verifyModal").modal('hide'); initTable3(); @@ -499,7 +505,7 @@ $("#verifyBtn").on('click', function () { keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 show: true//弹出对话框 }); - }else { + } else { //审核信息保存 var id = $("#archiveId").val(); //归档状态改为初审还是有就是初审内容保存 @@ -507,8 +513,8 @@ $("#verifyBtn").on('click', function () { var result = checkSuccessMethod(id); //记录单条完整性 $("#result").val(result); - if(result != '完整'){ - result = "完整性未通过:"+result+";"; + if (result != '完整') { + result = "完整性未通过:" + result + ";"; $("#resultLabel1").text(result); } var roleCode = $("#roleCode").val(); @@ -516,17 +522,17 @@ $("#verifyBtn").on('click', function () { var c1s = selectC1WithNotCollectFinishByPatientId(); $("#resultLabel2").text(c1s); if (result != '完整' || c1s != '') { - if(roleCode == '8' || roleCode == '64'){ + if (roleCode == '8' || roleCode == '64') { //定义不能提交的提示语 var resultAll = ''; - if(result != '完整'){ + if (result != '完整') { resultAll += result; } - if(c1s != ''){ + if (c1s != '') { resultAll += c1s; } toastr.warning(resultAll + "不允许提交"); - }else{ + } else { $('#WZModal').modal({ backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 @@ -535,11 +541,11 @@ $("#verifyBtn").on('click', function () { } } else { //实时查询科主任或护士长审核时采集任务是否采集完成 - var flag = judgeCollectCompleted('',$("#roleCode").val(),$("#jzh").val()); - if(!flag){ - return ; + var flag = judgeCollectCompleted('', $("#roleCode").val(), $("#jzh").val()); + if (!flag) { + return; } - save(1,''); + save(1, ''); } } }); @@ -547,11 +553,11 @@ $("#verifyBtn").on('click', function () { $("#wzSaveBtn").on('click', function () { $("#WZModal").modal('hide'); //实时查询科主任或护士长审核时采集任务是否采集完成 - var flag = judgeCollectCompleted('',$("#roleCode").val(),$("#jzh").val()); - if(!flag){ - return ; + var flag = judgeCollectCompleted('', $("#roleCode").val(), $("#jzh").val()); + if (!flag) { + return; } - save(1,''); + save(1, ''); }); //批量初审功能 批量审批① $("#approvesBtn").on('click', function () { @@ -563,7 +569,7 @@ $("#approvesBtn").on('click', function () { var approveCount = 0; //定义不需审核的集合下角标 var unSelects = []; - if(count !== 0){ + if (count !== 0) { var ids = ''; var roleCode = ''; var archivestate = ''; @@ -572,7 +578,7 @@ $("#approvesBtn").on('click', function () { for (var i = 0; i < count; i++) { //需要审批的对象 var power = selects[i].btns; - if(power != '') { + if (power != '') { approveCount++; //赋值审批角色 var role = power.split("(")[1].split(",")[0]; @@ -594,32 +600,33 @@ $("#approvesBtn").on('click', function () { isSuccess += "," + selects[i].isSuccess; } $("#role").val(roles); - }else{ + } else { unSelects.push(i); } } - if(ids == ''){ + if (ids == '') { toastr.warning("请选中需要审批的记录"); - }else{ + } else { //从selects中删除不需审核的对象 - if(unSelects.length > 0){ - for(var i = count - 1;i >= 0;i--){ - for(var j = 0;j < unSelects.length;j++){ - if(unSelects[j] == i){ - selects.splice(i,1); + if (unSelects.length > 0) { + for (var i = count - 1; i >= 0; i--) { + for (var j = 0; j < unSelects.length; j++) { + if (unSelects[j] == i) { + selects.splice(i, 1); break; } } } } - callApproveDiag(ids,roleCode,archivestate,isSuccess,approveCount); + callApproveDiag(ids, roleCode, archivestate, isSuccess, approveCount); } - }else{ + } else { toastr.warning("批量审批请至少选中一个"); } }); + //调用审批diag 批量审批② -function callApproveDiag(ids,roleCode,archivestate,isSuccess,approveCount) { +function callApproveDiag(ids, roleCode, archivestate, isSuccess, approveCount) { $('#verifyModal').modal('show'); $("#archiveId").val(ids); $("#roleCode").val(roleCode); @@ -629,8 +636,9 @@ function callApproveDiag(ids,roleCode,archivestate,isSuccess,approveCount) { //审批个数 $("#approveCount").val(approveCount); } + //批量初审确认 批量审批④ -$("#sureBtn").click(function(){ +$("#sureBtn").click(function () { //计算完整与不完整个数及不完整集合 var successCount = 0; var failCount = 0; @@ -638,25 +646,26 @@ $("#sureBtn").click(function(){ var flag = true; for (var i = 0; i < selects.length; i++) { var isSuccess = selects[i].isSuccess; - if(isSuccess == '0'){ + if (isSuccess == '0') { failCount++; failSelects.push(selects[i]); - }else{ + } else { //实时查询科主任或护士长审核时采集任务是否采集完成 - if(selects[i].operRole != null) { - flag = judgeCollectCompleted(selects[i].name,selects[i].operRole,selects[i].patientId); + if (selects[i].operRole != null) { + flag = judgeCollectCompleted(selects[i].name, selects[i].operRole, selects[i].patientId); } successCount++; } } - if(!flag){ - return ; + if (!flag) { + return; } $('#verifyModal').modal('hide'); - save(successCount,failSelects); + save(successCount, failSelects); }) + //提交后台审核 -function save(successCount,failSelects){ +function save(successCount, failSelects) { $("#sureModal").modal('hide'); var roleCode = $("#roleCode").val(); var firstTrial = $("#verifyText").val(); @@ -666,34 +675,43 @@ function save(successCount,failSelects){ var lockInfo = $("#result").val(); var id = $("#archiveId").val(); $.ajax({ - url: path+"/beHosp/updateStateByArchivId", + url: path + "/beHosp/updateStateByArchivId", type: "POST", - data: {id: id, remark: firstTrial,archivestate:archivestate, isSuccess:isSuccess,status: roleCode,roles:role,formToken:$("#formToken").val(),lockInfo:lockInfo}, - dataType:'json', + data: { + id: id, + remark: firstTrial, + archivestate: archivestate, + isSuccess: isSuccess, + status: roleCode, + roles: role, + formToken: $("#formToken").val(), + lockInfo: lockInfo + }, + dataType: 'json', success: function (data) { - if(data.code == 100){ + if (data.code == 100) { var failList = data.extend.unSuccessList; - if(failList != undefined){ + if (failList != undefined) { //存在不完整 for (var i = 0; i < failSelects.length; i++) { for (var j = 0; j < failList.length; j++) { var masterId = failList[j].id.replace(/\'/g, ""); - if(failSelects[i].id == masterId){ + if (failSelects[i].id == masterId) { failSelects[i].unSuccessAssortNames = failList[j].unSuccessAssortNames; } } } //赋值审核集合 - var returnInfo = '审批成功'+successCount+'个,资料缺失审批失败'+failSelects.length+'个'; + var returnInfo = '审批成功' + successCount + '个,资料缺失审批失败' + failSelects.length + '个'; $("#returnInfo").text(returnInfo); //加载表格 initTable4(failSelects); $('#unSuccessModal').modal('show'); - }else{ + } else { toastr.success("审核成功！"); } $("#table").bootstrapTable("refresh"); - }else{ + } else { toastr.error(data.msg); } } @@ -701,19 +719,19 @@ function save(successCount,failSelects){ } //实时查询各个采集任务是否采集完成 -function judgeCollectCompleted(name,roleCode,jzh){ +function judgeCollectCompleted(name, roleCode, jzh) { var flag = true; - if(roleCode == '8' || roleCode == '64'){ + if (roleCode == '8' || roleCode == '64') { $.ajax({ async: false, - url: path+"/beHosp/judgeCollectCompleted", + url: path + "/beHosp/judgeCollectCompleted", type: "POST", - data: {jzh:jzh}, + data: {jzh: jzh}, success: function (result) { if (result.code != 100) { flag = false; var msg = result.msg; - if(name != ''){ + if (name != '') { msg = name + msg; } toastr.warning(msg); @@ -737,7 +755,7 @@ $("#getRecallBtn").on('click', function () { $('#returnBtn').hide(); //根据病案号获取缺陷信息 $.ajax({ - url: path+"/lastVerify/getDetailByArchId", + url: path + "/lastVerify/getDetailByArchId", type: "POST", data: {archiveDetailId: $("#idLab").html()}, success: function (result) { @@ -764,41 +782,42 @@ $("#getRecallBtn").on('click', function () { //搜索条件需要查询审核状态的时候异步查询该审核角色拥有的code集合 function getCurrentCodes() { //只做一次查询赋值 - if($("#currentRoleIds").val() == ''){ + if ($("#currentRoleIds").val() == '') { $.ajaxSettings.async = false; - $.get(path+"/beHosp/getCurrentCodes",function(data){ + $.get(path + "/beHosp/getCurrentCodes", function (data) { $("#currentRole").val(data.code); $("#currentRoleIds").val(data.msg); - },'json') + }, 'json') $.ajaxSettings.async = true; } } + //加载审核节点 function getApproveRoles() { //只做一次查询赋值 - $.get(path+"/beHosp/getFlowRole",function(data){ - if(data.code == 100){ + $.get(path + "/beHosp/getFlowRole", function (data) { + if (data.code == 100) { var flowRoles = data.extend.list; - if(null != flowRoles && flowRoles != ''){ + if (null != flowRoles && flowRoles != '') { var html = ''; var currentRoleIds = selectMaxInfoId($("#currentRoleIds").val()); //获取操作角色 var checker = $("#checker").val(); for (var i = 0; i < flowRoles.length; i++) { - var option = ''; + var option = ''; var code = flowRoles[i].code; //过滤病案室审核128和病案室召回1024且无效的对象 - if(code != '128' && code != '1024' && flowRoles[i].effective == 1){ - if(code <= 64 && code >= 2 && checker != 4){ - if(currentRoleIds != '' && currentRoleIds >= flowRoles[i].id && checker == flowRoles[i].role){ + if (code != '128' && code != '1024' && flowRoles[i].effective == 1) { + if (code <= 64 && code >= 2 && checker != 4) { + if (currentRoleIds != '' && currentRoleIds >= flowRoles[i].id && checker == flowRoles[i].role) { html += option; } - }else{ - if(checker != 4 && flowRoles[i].role != null){ - if(checker == flowRoles[i].role){ + } else { + if (checker != 4 && flowRoles[i].role != null) { + if (checker == flowRoles[i].role) { html += option; } - }else{ + } else { html += option; } } @@ -806,19 +825,19 @@ function getApproveRoles() { } $("#infoId").append(html); } - }else{ + } else { toastr.error(data.msg); } - },'json') + }, 'json') } //取最大的审核审核id -function selectMaxInfoId(ids){ +function selectMaxInfoId(ids) { var temp = 0; var idArr = ids.split(','); for (var i = 0; i < idArr.length; i++) { - if(idArr[i] != ''){ - if(temp < idArr[i]){ + if (idArr[i] != '') { + if (temp < idArr[i]) { temp = idArr[i]; } } @@ -827,11 +846,11 @@ function selectMaxInfoId(ids){ } //监听审核节点查询的变更事件，记录属于支线 -$("#infoId").change(function(){ +$("#infoId").change(function () { var dataRole = $(this).find("option:selected").attr("data-role"); - if(dataRole == 1 || dataRole == 2) { + if (dataRole == 1 || dataRole == 2) { $("#searchOperRole").val(dataRole); - }else{ + } else { $("#searchOperRole").val(""); } }) @@ -890,10 +909,10 @@ $(function () { } //设置默认起止日期 var logotype = $("#logotype").val(); - if (logotype==1){ - setDate(null,null); + if (logotype == 1) { + setDate(null, null); } else { - setDate('startDateTo','endDateTo'); + setDate('startDateTo', 'endDateTo'); } }); @@ -911,34 +930,35 @@ $("#excelBtn").click(function () { var archivestate = $("#archivestate1").val(); var status = $("#currentRoleIds").val(); var role = $("#currentRole").val(); - var url = path+"/beHosp/exportExcel"; - post(url,{"doctorInCharge":doctorInCharge, - "inpNo":inpNo, - "visitId":visitId, - "name":name, - "deptName":deptName, - "startDateTo":startDateTo, - "endDateTo":endDateTo, - "isSearch":isSearch, - "archivestate":archivestate, - "status":status, - "role":role, - "roles":$("#searchOperRole").val(), - "isSuccess":$("#isSuccessSearch").val(), - "infoId":$("#infoId").val(), - "operRole":$("#checker").val(), - "callBackStatus":$("#callBackStatus").val(), - "printStatus":$("#printStatus").val() + var url = path + "/beHosp/exportExcel"; + post(url, { + "doctorInCharge": doctorInCharge, + "inpNo": inpNo, + "visitId": visitId, + "name": name, + "deptName": deptName, + "startDateTo": startDateTo, + "endDateTo": endDateTo, + "isSearch": isSearch, + "archivestate": archivestate, + "status": status, + "role": role, + "roles": $("#searchOperRole").val(), + "isSuccess": $("#isSuccessSearch").val(), + "infoId": $("#infoId").val(), + "operRole": $("#checker").val(), + "callBackStatus": $("#callBackStatus").val(), + "printStatus": $("#printStatus").val() }); }); /** * 校验完整性 * */ -$("#checkSuccessBtn").click(function(){ +$("#checkSuccessBtn").click(function () { var masterId = $("#masterId").val(); var result = checkSuccessMethod(masterId); - if(result != '失败'){ + if (result != '失败') { $("#wzContent").text(result); //增加完整性刷新后高亮状态 $("#wzContent").addClass("wzContent"); @@ -950,7 +970,7 @@ $("#checkSuccessBtn").click(function(){ lockinfo: result } }); - }else{ + } else { toastr.warning("校验失败,校验程序未启动或出错!"); } }) @@ -979,27 +999,28 @@ var opts = { top: '150px' // Top position relative to parent in px |相对父元素的top }; var spinner = new Spinner(opts); + //获取所有分段列表 -function initTree2(deptName,masterId) { +function initTree2(deptName, masterId) { zNodes = [] $.ajax({ - url: path+"/transferDeptUser/selectTranferDeptUserTree", + url: path + "/transferDeptUser/selectTranferDeptUserTree", type: "POST", - data:{deptName:deptName,masterId:masterId}, + data: {deptName: deptName, masterId: masterId}, success: function (result) { var rootChecked = true; if (result != null) { - for(var ele in result){ + for (var ele in result) { zNodes.push(result[ele]); - if(result[ele].checked == null){ + if (result[ele].checked == null) { rootChecked = false; } } } //判断是否根节点选中 - if(rootChecked && result != null){ - zNodes.push({id: 0, parentId: 0, name: '用户列表', open: true,checked:"true"}); - }else{ + if (rootChecked && result != null) { + zNodes.push({id: 0, parentId: 0, name: '用户列表', open: true, checked: "true"}); + } else { zNodes.push({id: 0, parentId: 0, name: '用户列表', open: true}); } $.fn.zTree.init($("#ztree2"), setting1, zNodes); @@ -1047,6 +1068,7 @@ function blurKey2() { key.addClass("empty"); } } + function getFontCss(treeId, treeNode) { return (!!treeNode.highlight) ? {color: "#A60000", "font-weight": "bold"} : { color: "#333", @@ -1087,6 +1109,7 @@ function filterNodes(node, inputStr, filterResult) { return true; } } + function searchNode2() { var zTree = $.fn.zTree.getZTreeObj("ztree2"); var value = $("#key2").val(); @@ -1105,24 +1128,26 @@ function searchNode2() { } zTree.expandAll(true); } + //展开 function expandAll2(num) { - var treeObj = $.fn.zTree.getZTreeObj("ztree"+num); + var treeObj = $.fn.zTree.getZTreeObj("ztree" + num); treeObj.expandAll(true); } //收缩 function collapseAll2(num) { - var treeObj = $.fn.zTree.getZTreeObj("ztree"+num); + var treeObj = $.fn.zTree.getZTreeObj("ztree" + num); treeObj.expandAll(false); } + //保存 -$("#transferDeptUserBtn").click(function(){ +$("#transferDeptUserBtn").click(function () { var saveNodes = []; var zTree = $.fn.zTree.getZTreeObj("ztree2"); - var nodes=zTree.getCheckedNodes(true); + var nodes = zTree.getCheckedNodes(true); for (var i = 0; i < nodes.length; i++) { - if(nodes[i].level == 3){ + if (nodes[i].level == 3) { var obj = new Map(); obj['deptCode'] = nodes[i].code; obj['userName'] = nodes[i].realName; @@ -1131,26 +1156,27 @@ $("#transferDeptUserBtn").click(function(){ } } $.ajax({ - type:'post', - url:path+'/transferDeptUser/updateTransferDeptUserSet', - data:{jsonStr:JSON.stringify(saveNodes)}, - dateType:'json', - success:function(data){ - if(data.code == 100){ + type: 'post', + url: path + '/transferDeptUser/updateTransferDeptUserSet', + data: {jsonStr: JSON.stringify(saveNodes)}, + dateType: 'json', + success: function (data) { + if (data.code == 100) { toastr.success("保存成功"); - }else{ + } else { toastr.error(data.msg); } } }) }); + //主管医生下拉框修改即查询 -function doctorOnChange(){ +function doctorOnChange() { //标识为按条件查询 $("#isSearch").val(1); - if(tipLoad==0) { + if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); - }else{ + } else { toastr.warning("正在查询，请稍等..."); } } \ No newline at end of file diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js index ba34e9a..5cb7831 100644 --- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js +++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js @@ -1269,22 +1269,10 @@ function initTable5(data,sidePagination) { }, events: { 'click .editInfo': function (e, value, row, index) { - var id = row.idTemp; - var sysflag = row.sysflag; - var notNursingIds = ''; - var nursingIds=''; - var dzblIds=''; - if(sysflag = 1){ - nursingIds= id; - } - if(sysflag != 1){ - sysflag = ''; - notNursingIds = id; - } - if(sysflag = 3){ - dzblIds= id; - } - submitUpdate(id,notNursingIds,row.did,sysflag,nursingIds,dzblIds); + var ids = row.idTemp; + var sysflag = ''; + var notNursingIds = row.idTemp; + submitUpdate(ids,notNursingIds,sysflag); } } }, @@ -1586,7 +1574,6 @@ $("#searchBtn6").click(function(){ var sysflag = ''; var notNursingIds = ''; var nursingIds=''; - var dzblIds=''; var detailIds = ''; for (var i = 0; i < data.length; i++) { var id = data[i].idTemp; @@ -1619,15 +1606,7 @@ $("#searchBtn6").click(function(){ } notNursingIds += id; } - if(data[i].sysflag == 3){ - //判断包含护理 - sysflag = 3; - if(dzblIds != ''){ - dzblIds += ','; - } - dzblIds += id; - } } - submitUpdate(ids,notNursingIds,detailIds,sysflag,nursingIds,dzblIds); + submitUpdate(ids,notNursingIds,detailIds,sysflag,nursingIds); } })