From f99c80395ae1b5868db184b52ed792e37b8d9bbb Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Thu, 3 Jul 2025 14:48:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=BA=93=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonnelLibraryController.java | 39 ++-- .../controller/importExcelController.java | 21 ++ .../basic/dao/PersonnelLibraryDao.java | 2 + .../basic/entity/PersonnelLibraryBean.java | 10 + .../basic/service/ImportExcelService.java | 2 + .../service/impl/ImportExcelServiceImpl.java | 201 ++++++++++++++++++ .../service/impl/PackageTypeServiceImpl.java | 4 +- .../manager/controller/UserController.java | 8 +- .../manager/controller/UtilController.java | 8 + .../boot/manager/manager/dao/UtilDao.java | 2 + .../manager/manager/service/UtilService.java | 2 + .../manager/service/impl/UtilServiceImpl.java | 5 + .../mappers/basic/PackageTypeMapper.xml | 18 +- .../mappers/basic/PersonnelLibraryMapper.xml | 29 ++- .../resources/mappers/basic/UtilMapper.xml | 4 + .../mappers/statistics/resStatistcsMapper.xml | 24 ++- src/main/resources/static/js/select.js | 27 +++ .../static/js/work/basic/PackageTypeList.js | 5 +- .../js/work/basic/PersonnelLibraryList.js | 57 ++++- .../reservation/resStatisticsChildList.js | 13 +- .../pages/work/basic/PackageTypeForm.html | 15 +- .../work/basic/PersonnelLibraryForm.html | 24 ++- .../work/basic/PersonnelLibraryList.html | 11 +- 23 files changed, 452 insertions(+), 79 deletions(-) diff --git a/src/main/java/com/bonus/boot/manager/basic/controller/PersonnelLibraryController.java b/src/main/java/com/bonus/boot/manager/basic/controller/PersonnelLibraryController.java index 13f805c..85cc3a4 100644 --- a/src/main/java/com/bonus/boot/manager/basic/controller/PersonnelLibraryController.java +++ b/src/main/java/com/bonus/boot/manager/basic/controller/PersonnelLibraryController.java @@ -86,24 +86,26 @@ public class PersonnelLibraryController { UnifyTask unifyTask = new UnifyTask(); if (cb != 3 && cb != 5){ String token = login(); - String isActive = addUser(bean.getPersonName(), bean.getPhone(),token); - if(isActive.equals("1")){ - ks = 1; - ar.setFailMsg(GlobalConst.INIT_SUCCEED); - }else{ - for (int i = 0; i < 3; i++) { - isActive = addUser(bean.getPersonName(), bean.getPhone(),token); - if(isActive.equals("1")){ - ks = 1; - ar.setFailMsg(GlobalConst.INIT_SUCCEED); - break; + if(token!=null && token.length()>0 ){ + String isActive = addUser(bean.getPersonName(), bean.getPhone(),token); + if(isActive.equals("1")){ + ks = 1; + ar.setFailMsg(GlobalConst.INIT_SUCCEED); + }else{ + for (int i = 0; i < 3; i++) { + isActive = addUser(bean.getPersonName(), bean.getPhone(),token); + if(isActive.equals("1")){ + ks = 1; + ar.setFailMsg(GlobalConst.INIT_SUCCEED); + break; + } } } - } - //三次都未推送成功 修改推送状态 - if(ks!=1){ - userService.updateUnify(Long.valueOf(bean.getHospId())); - ar.setFailMsg(GlobalConst.INIT_SUCCEED); + //三次都未推送成功 修改推送状态 + if(ks!=1){ + userService.updateUnify(Long.valueOf(bean.getHospId())); + ar.setFailMsg(GlobalConst.INIT_SUCCEED); + } } }else { ar.setFailMsg(GlobalConst.DATA_FAIL); @@ -267,7 +269,10 @@ public class PersonnelLibraryController { JSONObject object = JSON.parseObject(params); String result = HttpClientUtils.doHttpPost(AddressConfiguration.UNIFICATION_URL + "/ynuw/sys/api/putUser", object, token); JSONObject jsonObject = JSONObject.parseObject(result); - String code = jsonObject.getString("code"); + String code = "00"; + if(jsonObject != null && jsonObject.containsKey("code")){ + code = jsonObject.getString("code"); + } System.err.println("新增code="+code); if("200".equals(code)){ JSONArray data = jsonObject.getJSONArray("data"); diff --git a/src/main/java/com/bonus/boot/manager/basic/controller/importExcelController.java b/src/main/java/com/bonus/boot/manager/basic/controller/importExcelController.java index 3f8fdd8..d5e718c 100644 --- a/src/main/java/com/bonus/boot/manager/basic/controller/importExcelController.java +++ b/src/main/java/com/bonus/boot/manager/basic/controller/importExcelController.java @@ -97,4 +97,25 @@ public class importExcelController { return ar; } + @LogAnnotation + @PostMapping("/reservationNew") + @ApiOperation(value = "体检人员库导入") + public AjaxRes reservationNew(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException { + int result = 1; + AjaxRes ar = new AjaxRes(); + try { + List lstObj = (List) ImportNoPhotoExcelHelper.readExcel(file, PersonnelReservationBean.class); + String code = service.reservationNew(lstObj); + if ("导入成功".equals(code)){ + ar.setSucceedMsg("导入成功"); + }else{ + ar.setFailMsg(code); + } + } catch (Exception e) { + e.printStackTrace(); + ar.setFailMsg(e.getMessage()); + } + return ar; + } + } diff --git a/src/main/java/com/bonus/boot/manager/basic/dao/PersonnelLibraryDao.java b/src/main/java/com/bonus/boot/manager/basic/dao/PersonnelLibraryDao.java index 8f726ab..7888251 100644 --- a/src/main/java/com/bonus/boot/manager/basic/dao/PersonnelLibraryDao.java +++ b/src/main/java/com/bonus/boot/manager/basic/dao/PersonnelLibraryDao.java @@ -55,4 +55,6 @@ public interface PersonnelLibraryDao { int getPhoneBy(@Param("personName")String personName,@Param("phone")String phone); int getIdNumber(@Param("idNumber")String idNumber); + + PersonnelReservationBean getMealNameNew(@Param("setMeal")String setMeal); } diff --git a/src/main/java/com/bonus/boot/manager/basic/entity/PersonnelLibraryBean.java b/src/main/java/com/bonus/boot/manager/basic/entity/PersonnelLibraryBean.java index bdcc5cb..cdba8df 100644 --- a/src/main/java/com/bonus/boot/manager/basic/entity/PersonnelLibraryBean.java +++ b/src/main/java/com/bonus/boot/manager/basic/entity/PersonnelLibraryBean.java @@ -116,4 +116,14 @@ public class PersonnelLibraryBean extends HospitalBean{ private String userId; + /** + * 套餐名称 + */ + private String typeName; + + /** + * 套餐名称id + */ + private String baseNameId; + } diff --git a/src/main/java/com/bonus/boot/manager/basic/service/ImportExcelService.java b/src/main/java/com/bonus/boot/manager/basic/service/ImportExcelService.java index f503f3a..cc3d95c 100644 --- a/src/main/java/com/bonus/boot/manager/basic/service/ImportExcelService.java +++ b/src/main/java/com/bonus/boot/manager/basic/service/ImportExcelService.java @@ -13,4 +13,6 @@ public interface ImportExcelService { String savenegativeResult(List lstObj); String reservation(List lstObj); + + String reservationNew(List lstObj); } diff --git a/src/main/java/com/bonus/boot/manager/basic/service/impl/ImportExcelServiceImpl.java b/src/main/java/com/bonus/boot/manager/basic/service/impl/ImportExcelServiceImpl.java index eeeec54..0f763f2 100644 --- a/src/main/java/com/bonus/boot/manager/basic/service/impl/ImportExcelServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/basic/service/impl/ImportExcelServiceImpl.java @@ -460,6 +460,207 @@ public class ImportExcelServiceImpl implements ImportExcelService { } + @Override + public String reservationNew(List lstObj) { + + List validBeans = new ArrayList<>(); // 用于存储通过验证的数据 + String res = ""; + int team = 1; + int i = 0; + String personName = ""; + String phone = ""; + String idNumber = ""; + String department = ""; + String hospital = ""; + String sex = ""; + String setMeal = ""; + boolean hasError = false; // 标志位，用于记录是否有错误 + + try { + if (lstObj != null && lstObj.size() > 0) { + for (JSONObject obj : lstObj) { + i++; + PersonnelReservationBean bean = new PersonnelReservationBean(); // 每个对象创建一个新的Bean + personName = obj.getString("personName").trim(); + idNumber = obj.getString("idNumber").trim(); + sex = obj.getString("sex").trim(); + department = obj.getString("department").trim(); + hospital = obj.getString("hospital").trim(); + setMeal = obj.getString("setMeal").trim(); + phone = obj.getString("phone").trim(); + + // 判断姓名为空 + if (StringHelper.isEmpty(personName)) { + res += "第" + i + "行姓名为空;"; + hasError = true; + } + bean.setPersonName(personName); + + // 判断身份证为空 + if (StringHelper.isEmpty(idNumber) || "0.0".equals(idNumber.trim())) { + res += "第" + i + "行" + personName + "行身份证为空;"; + team = 2; + hasError = true; + } else if (idNumber.length() != 18) { + res += "第" + i + "行" + personName + "行身份证格式错误;"; + team = 2; + hasError = true; + } + bean.setIdNumber(idNumber); + + // 判断性别为空 + if (StringHelper.isEmpty(sex)) { + res += "第" + i + "行" + personName + "行性别为空;"; + team = 2; + hasError = true; + } else { + String a = getSexByIdcard(idNumber); + String b = ""; + if (sex.equals("男")) { + b = "0"; + } else { + b = "1"; + } + if (!a.equals(b)) { + res += "第" + i + "行" + personName + "行身份证与性别不匹配;"; + hasError = true; + } else { + bean.setSex(b); + } + } + +// // 判断部门名称为空 +// if (!department.isEmpty()) { +// String departmentName = dao.getdepartmentName(department); +// if (StringHelper.isEmpty(departmentName) || "0.0".equals(departmentName.trim())) { +// team = 2; +// res += "第" + i + "行" + personName + "部门名称有误，请检查"; +// hasError = true; +// } else { +// bean.setDepartment(departmentName + ""); +// } +// } else { +// team = 2; +// res += "第" + i + "行" + personName + "部门名称为空"; +// hasError = true; +// } + + // 判断医院名称为空 + if (StringHelper.isEmpty(hospital)) { + res += "第" + i + "行" + personName + "行医院名称为空;"; + team = 2; + hasError = true; + } else { + if (hospital.equals("1")) { + bean.setHospital("33"); + } else if (hospital.equals("2")) { + bean.setHospital("34"); + } else if (hospital.equals("3")) { + bean.setHospital("35"); + } else { + res += "第" + i + "行" + personName + "行医院名称有误，请检查"; + hasError = true; + } + } + + String ifHighee = null; // 判断是否为高职 + // 判断体检套餐为空 + if (StringHelper.isEmpty(setMeal)) { + res += "第" + i + "行" + personName + "行体检套餐为空;"; + team = 2; + hasError = true; + } else { +// PersonnelReservationBean bean1 = dao.getMealName(setMeal); + PersonnelReservationBean bean1 = dao.getMealNameNew(setMeal); + if(bean1!=null){ + String setMealName = bean1.getSetMealId(); + ifHighee = bean1.getIfHighee(); + if (StringHelper.isEmpty(setMealName) || "0.0".equals(setMealName.trim())) { + team = 2; + res += "第" + i + "行" + personName + "体检套餐有误，请检查"; + hasError = true; + } else { + bean.setSetMeal(setMealName + ""); + bean.setCheckType(bean1.getCheckType()); + bean.setCombName(setMeal); + } + }else{ + team = 2; + res += "第" + i + "行" + personName + "体检套餐有误，请检查"; + hasError = true; + } + + } + + // 判断手机号码为空 + if (StringHelper.isEmpty(phone) || "0.0".equals(phone.trim())) { + res += "第" + i + "行" + personName + "行手机号码为空;"; + team = 2; + hasError = true; + } else if (!isLegalMobileNumber(phone)) { + res += "第" + i + "行" + personName + "行手机号码格式错误;"; + team = 2; + hasError = true; + } + bean.setPhone(phone); + + // 查询通过身份证、姓名、电话去查询 + int personNameNum = dao.getPersonNameBy(personName); + if (personNameNum > 0) { + + } else { + res += "第" + i + "行" + personName + "行姓名有误。请检查"; + team = 2; + hasError = true; + } + + int phoneNum = dao.getPhoneBy(personName,phone); + if (phoneNum > 0) { + + }else{ + res += "第" + i + "行" + personName + "行手机号有误。请检查"; + team = 2; + hasError = true; + } + + if (team != 2) { + PersonnelReservationBean beans = dao.getInfoById(personName, idNumber, phone,""); + if (beans != null) { + // 获取预约人的id + // bean.setId(beans.getId()); + } else { + res += "第" + i + "行" + personName + "行身份证有误。请检查"; + hasError = true; + } + + PersonnelReservationBean beans1 = dao.getInfoById(personName, idNumber, phone,""); + if (beans1 != null) { + // 获取预约人的id + bean.setId(beans1.getId()); + } else { + res += "第" + i + "行" + personName + "行高职与非高职有误。请检查"; + hasError = true; + } + } + // 只有在没有错误的情况下才执行新增操作 + if (!hasError) { + validBeans.add(bean); + } + } + // 只有在没有错误的情况下才执行批量导入操作 + if (!hasError) { + for (PersonnelReservationBean bean : validBeans) { + int k = dao.updateReservation(bean); + } + res = "导入成功"; + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return res; + } + private String ChangepersonType(String personType) { String team; if (personType.equals("在职")) { diff --git a/src/main/java/com/bonus/boot/manager/basic/service/impl/PackageTypeServiceImpl.java b/src/main/java/com/bonus/boot/manager/basic/service/impl/PackageTypeServiceImpl.java index 6477579..7f23890 100644 --- a/src/main/java/com/bonus/boot/manager/basic/service/impl/PackageTypeServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/basic/service/impl/PackageTypeServiceImpl.java @@ -32,7 +32,7 @@ public class PackageTypeServiceImpl implements PackageTypeService { @Override public int addInfo(BaseTypePackageBean bean) { - int num = utilDao.determineIfExists("pm_base_type_package","type_name",bean.getTypeName(),""); + int num = utilDao.determineIfExists("pm_base_type_package_name","type_name",bean.getTypeName(),""); if(num > 0){ num = 3; }else { @@ -43,7 +43,7 @@ public class PackageTypeServiceImpl implements PackageTypeService { @Override public int updateInfo(BaseTypePackageBean bean) { - int num = utilDao.determineIfExists("pm_base_type_package","type_name",bean.getTypeName(),bean.getId()+""); + int num = utilDao.determineIfExists("pm_base_type_package_name","type_name",bean.getTypeName(),bean.getId()+""); if(num > 0){ num = 3; }else { diff --git a/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java b/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java index 9093aa1..2aaa5f6 100644 --- a/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java +++ b/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java @@ -350,8 +350,12 @@ public class UserController { // String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/userLogin", object, null); String result = HttpClientUtils.doHttpPost(AddressConfiguration.UNIFICATION_URL + "/ynuw/sys/api/userLogin", object, null); JSONObject jsonObject = JSONObject.parseObject(result); - String string = JSONObject.parseObject(jsonObject.getString("data")).getString("token"); - return string; + if(jsonObject == null || jsonObject.isEmpty()){ + return ""; + }else{ + String string = JSONObject.parseObject(jsonObject.getString("data")).getString("token"); + return string; + } } //统一平台后台新增接口 获取token diff --git a/src/main/java/com/bonus/boot/manager/manager/controller/UtilController.java b/src/main/java/com/bonus/boot/manager/manager/controller/UtilController.java index b19e920..1c58632 100644 --- a/src/main/java/com/bonus/boot/manager/manager/controller/UtilController.java +++ b/src/main/java/com/bonus/boot/manager/manager/controller/UtilController.java @@ -107,5 +107,13 @@ public class UtilController { List list = service.getSetMeal(o); return R.okTable(list, list.size()); } + + @LogAnnotation + @PostMapping(value = "/getPackageTypeName") + @ApiOperation(value = "套餐类型select列表") + public List getPackageTypeName() { + List result = service.getPackageTypeName(); + return result; + } } diff --git a/src/main/java/com/bonus/boot/manager/manager/dao/UtilDao.java b/src/main/java/com/bonus/boot/manager/manager/dao/UtilDao.java index 777b60f..a415365 100644 --- a/src/main/java/com/bonus/boot/manager/manager/dao/UtilDao.java +++ b/src/main/java/com/bonus/boot/manager/manager/dao/UtilDao.java @@ -62,4 +62,6 @@ public interface UtilDao { List getExaminationHospital(); List getNewHospitalSelect(MapBean bean); + + List getPackageTypeName(); } diff --git a/src/main/java/com/bonus/boot/manager/manager/service/UtilService.java b/src/main/java/com/bonus/boot/manager/manager/service/UtilService.java index d4453fe..a1677e9 100644 --- a/src/main/java/com/bonus/boot/manager/manager/service/UtilService.java +++ b/src/main/java/com/bonus/boot/manager/manager/service/UtilService.java @@ -44,4 +44,6 @@ public interface UtilService { List getExaminationHospital(); List getNewHospitalSelect(MapBean o); + + List getPackageTypeName(); } diff --git a/src/main/java/com/bonus/boot/manager/manager/service/impl/UtilServiceImpl.java b/src/main/java/com/bonus/boot/manager/manager/service/impl/UtilServiceImpl.java index a879a70..105874c 100644 --- a/src/main/java/com/bonus/boot/manager/manager/service/impl/UtilServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/manager/service/impl/UtilServiceImpl.java @@ -75,4 +75,9 @@ public class UtilServiceImpl implements UtilService { bean.setHospitalId(hospiral); return utilDao.getNewHospitalSelect(bean); } + + @Override + public List getPackageTypeName() { + return utilDao.getPackageTypeName(); + } } diff --git a/src/main/resources/mappers/basic/PackageTypeMapper.xml b/src/main/resources/mappers/basic/PackageTypeMapper.xml index 36a86ff..79daaa9 100644 --- a/src/main/resources/mappers/basic/PackageTypeMapper.xml +++ b/src/main/resources/mappers/basic/PackageTypeMapper.xml @@ -2,25 +2,24 @@ - insert into pm_base_type_package (type_name,package_descri,is_active) - values (#{typeName},#{packageDescri},'1') + insert into pm_base_type_package_name (type_name,is_active) + values (#{typeName},'1') - update pm_base_type_package set type_name = #{typeName},package_descri = #{packageDescri} + update pm_base_type_package_name set type_name = #{typeName} where id = #{id} - update pm_base_type_package set is_active = '0' where id = #{id} + update pm_base_type_package_name set is_active = '0' where id = #{id} select id, - type_name as typeName, - package_descri as packageDescri - from pm_base_type_package + type_name as typeName + from pm_base_type_package_name where is_active = '1' and id = #{id} diff --git a/src/main/resources/mappers/basic/PersonnelLibraryMapper.xml b/src/main/resources/mappers/basic/PersonnelLibraryMapper.xml index bbc499a..1b49f75 100644 --- a/src/main/resources/mappers/basic/PersonnelLibraryMapper.xml +++ b/src/main/resources/mappers/basic/PersonnelLibraryMapper.xml @@ -5,9 +5,9 @@ insert into - pm_base_physical(phy_name,idcard,age,depart_id,sex,if_higher,telep_number,if_job,special_job,phy_password,is_active,status,nosocomium,set_meal,personnel_type,pushStatus) + pm_base_physical(phy_name,idcard,age,depart_id,sex,if_higher,telep_number,if_job,special_job,phy_password,is_active,status,nosocomium,personnel_type,pushStatus,base_name_id) values - (#{personName},#{idNumber},#{age},#{departmentId},#{sex},#{higherJob},#{phone},#{personType},#{specialPost},#{password},'1','1',#{hospital},#{setMeal},#{personnelType},'1') + (#{personName},#{idNumber},#{age},#{departmentId},#{sex},#{higherJob},#{phone},#{personType},#{specialPost},#{password},'1','1',#{hospital},#{personnelType},'1',#{baseNameId}) insert into pm_physical_result(physical_id) @@ -27,7 +27,7 @@ special_job = #{specialPost}, nosocomium = #{hospital}, personnel_type = #{personnelType}, - set_meal = #{setMeal} + base_name_id = #{baseNameId} where id = #{id} and is_active = '1' @@ -92,12 +92,14 @@ when '2' then '肿瘤' when '3' then '综合' else '' - end as setMeal + end as setMeal, + pn.type_name as typeName from pm_base_physical pbp left join pm_base_hospital pbh on pbh.id = pbp.nosocomium left join sys_dic_detail sdd on sdd.id = pbp.if_job left join pm_base_special_job pbsj on pbsj.id = pbp.special_job and pbsj.is_active = '1' - left join pm_phy_organization po on po.id = pbp.depart_id + left join pm_organization po on po.id = pbp.depart_id + LEFT JOIN pm_base_type_package_name pn on pn.id = pbp.base_name_id where pbp.is_active = '1' AND pbp.phy_name LIKE concat ('%',#{personName},'%') @@ -124,10 +126,13 @@ pbsj.job_name as specialPostName, pbp.nosocomium as hospital, pbp.personnel_type as personnelType, - pbp.set_meal as setMeal + pbp.set_meal as setMeal, + pbp.base_name_id as baseNameId, + pn.type_name as typeName from pm_base_physical pbp left join pm_base_special_job pbsj on pbsj.id = pbp.special_job and pbsj.is_active = '1' - left join pm_phy_organization po on po.id = pbp.depart_id + left join pm_organization po on po.id = pbp.depart_id + LEFT JOIN pm_base_type_package_name pn on pn.id = pbp.base_name_id where pbp.is_active = '1' and pbp.id = #{id} @@ -147,7 +152,7 @@ @@ -197,12 +202,16 @@ where is_active = '1' and idcard = #{idNumber} + + update pm_base_physical set - depart_id=#{department}, nosocomium=#{hospital}, - set_meal = #{checkType} + base_name_id = #{setMeal} where is_active = '1' and id=#{id} diff --git a/src/main/resources/mappers/basic/UtilMapper.xml b/src/main/resources/mappers/basic/UtilMapper.xml index 3d53e5f..0f68314 100644 --- a/src/main/resources/mappers/basic/UtilMapper.xml +++ b/src/main/resources/mappers/basic/UtilMapper.xml @@ -70,6 +70,10 @@ select count(1) from pm_base_physical where telep_number=#{0} and is_active='1' select id as `key`,hospital as `value` from pm_base_hospital where is_active ='1' + + diff --git a/src/main/resources/mappers/statistics/resStatistcsMapper.xml b/src/main/resources/mappers/statistics/resStatistcsMapper.xml index 1600817..d0d2d9f 100644 --- a/src/main/resources/mappers/statistics/resStatistcsMapper.xml +++ b/src/main/resources/mappers/statistics/resStatistcsMapper.xml @@ -6,7 +6,7 @@ SELECT a.phy_appont_time as `key`,COUNT(a.id) as `value` FROM pm_base_phy_appont a LEFT JOIN pm_base_physical b on b.id = a.user_id - WHERE a.if_cancel ='2' and b.is_active = '1' and a.if_career_appoint = '2' + WHERE a.if_cancel ='2' and b.is_active = '1' @@ -44,15 +44,17 @@ a.phy_name AS personName, a.idcard AS idNumber, a.age, - CASE - WHEN check_content_id = 1 THEN - '心血管' - WHEN check_content_id = 2 THEN - '肿瘤' - WHEN check_content_id = 3 THEN - '综合' - ELSE - '' end AS checkContentId, + case when check_content_id != "" THEN '常规体检' + else '职业体检' END AS checkContentId, +-- CASE +-- WHEN check_content_id = 1 THEN +-- '心血管' +-- WHEN check_content_id = 2 THEN +-- '肿瘤' +-- WHEN check_content_id = 3 THEN +-- '综合' +-- ELSE +-- '' end AS checkContentId, IF (a.sex = '0', '男', '女') AS sex, # IF (b.if_edu = '0', '否', '是') AS ifEdu, IF(a.if_higher = '0', '否', '是') AS higherJob, @@ -75,7 +77,7 @@ WHERE if_cancel = '2' AND (check_content_id != "" OR check_content_id IS NOT NULL) ) b ON a.id = b.user_id and a.is_active ='1' - LEFT JOIN pm_phy_organization pmo ON pmo.ID = a.depart_id and pmo.IS_ACTIVE ='1' + LEFT JOIN pm_organization pmo ON pmo.ID = a.depart_id and pmo.IS_ACTIVE ='1' LEFT JOIN pm_base_hospital pbh ON pbh.id = b.hospital_id and pbh.is_active = '1' LEFT JOIN sys_user sysu ON sysu.id = b.appoint_name_id and sysu.is_active ='1' WHERE diff --git a/src/main/resources/static/js/select.js b/src/main/resources/static/js/select.js index 08306f3..d7f2dc8 100644 --- a/src/main/resources/static/js/select.js +++ b/src/main/resources/static/js/select.js @@ -223,4 +223,31 @@ function getHazard(form,hazard) { console.log("获取危害因素下拉列表出错：", err); } }); +} + + +function getPackageTypeName(form,baseNameId) { + $("#baseNameId").html(""); + $.ajax({ + type: 'post', + url: ctxPath + '/utilConnection/getPackageTypeName', + data: { + }, + async: false, + success: function (data) { + var html = ''; + for (var i = 0; i < data.length; i++) { + if (baseNameId == data[i].key) { + html += ''; + } else { + html += ''; + } + } + $("#baseNameId").html(html); + layui.form.render('select'); //这里就是我们要渲染的地方了 + }, + error: function (err) { + console.log("获取套餐类型下拉列表出错：", err); + } + }); } \ No newline at end of file diff --git a/src/main/resources/static/js/work/basic/PackageTypeList.js b/src/main/resources/static/js/work/basic/PackageTypeList.js index c2902e0..fd9ac26 100644 --- a/src/main/resources/static/js/work/basic/PackageTypeList.js +++ b/src/main/resources/static/js/work/basic/PackageTypeList.js @@ -15,9 +15,8 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () { { field: 'number', width:120,title: '序号', align: 'center', type: 'numbers' } - , {field: 'typeName', align: 'center', title: '类型名称'} - , {field: 'packageDescri', align: 'center', title: '套餐描述'} - , {fixed: 'right', title: '操作', width: 200, align: 'center', toolbar: '#toolsBar'} + , {field: 'typeName', align: 'center', title: '类型名称'} + , {fixed: 'right', title: '操作', align: 'center', toolbar: '#toolsBar'} ]] , id: 'menuTable' , page: true //开启分页 diff --git a/src/main/resources/static/js/work/basic/PersonnelLibraryList.js b/src/main/resources/static/js/work/basic/PersonnelLibraryList.js index 250a5c0..0df75cf 100644 --- a/src/main/resources/static/js/work/basic/PersonnelLibraryList.js +++ b/src/main/resources/static/js/work/basic/PersonnelLibraryList.js @@ -38,7 +38,7 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () { , {field: 'personnelType', width: 120, align: 'center', title: '人员类型'} , {field: 'specialPost', width: 150, align: 'center', title: '是否特殊岗位'} , {field: 'hospital', width: 150, align: 'center', title: '体检医院'} - , {field: 'setMeal', width: 150, align: 'center', title: '体检套餐'} + , {field: 'typeName', width: 150, align: 'center', title: '体检套餐'} , {fixed: 'right',width: 270, title: '操作', align: 'center', toolbar: '#toolsBar'} ]] , id: 'menuTable' @@ -261,4 +261,59 @@ function importExcelYu() { } }); $("#articleImageFileYu").val(""); +} + + + +function fetchExcelNew(){ + window.location.href = ctxPath + "/download/download?filename=预约体检模版.xlsx" +} + +function importExcelNew() { + var formData = new FormData($('form')[0]); + var name = $("#articleImageFileNew").val(); + if (name == null || name == "") { + layer.msg("请上传Excel表格(.xlsx)"); + return; + } + if (!(name.endsWith(".xlsx"))) { + layer.msg("请上传正确的Excel表格(.xlsx)!"); + $("#articleImageFileNew").val(""); + return; + } + formData.append("file", $("#articleImageFileNew")[0].files[0]); + console.log(formData) + var idx = layer.msg('正在提交数据,请稍等...', { + icon: 16 + , shade: 0.01 + , time: '-1' + }); + $.ajax({ + url: ctxPath + "/export/reservationNew", + type: 'POST', + async: true, + data: formData, + timeout: 60 * 1000 * 10, + // 告诉jQuery不要去处理发送的数据 + processData: false, + // 告诉jQuery不要去设置Content-Type请求头 + contentType: false, + success: function (data) { + if (data.resMsg == '导入成功') { + showMessages('导入成功！', true); + setTimeout(() => { + window.location.reload(); + }, 30001) + } else { + showMessage(data.resMsg, false); + } + + console.log(data) + }, + error: function (XMLHttpRequest, textStatus, errorThrown) { + console.log(JSON.stringify(errorThrown)); + layer.close(idx); + } + }); + $("#articleImageFileNew").val(""); } \ No newline at end of file diff --git a/src/main/resources/static/js/work/statistics/reservation/resStatisticsChildList.js b/src/main/resources/static/js/work/statistics/reservation/resStatisticsChildList.js index ef67ee4..c2a4c71 100644 --- a/src/main/resources/static/js/work/statistics/reservation/resStatisticsChildList.js +++ b/src/main/resources/static/js/work/statistics/reservation/resStatisticsChildList.js @@ -35,10 +35,19 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () { , {field: 'higherJob', width: 240, align: 'center', title: '是否高职'} , {field: 'reservationTime', width: 200, align: 'center', title: '预约体检时间'} , {field: 'name', width: 200, align: 'center', title: '预约医院'} - , {field: 'checkContentId', width: 200, align: 'center', title: '预约套餐'} + , {field: 'checkContentId', width: 200, align: 'center', title: '预约体检', + // templet:function(res){ + // var checkContentId = res.checkContentId; + // if(checkContentId){ + // return "常规体检"; + // }else{ + // return "职业体检"; + // } + // } + } , {field: 'combName', width: 200, align: 'center', title: '套餐名称'} , {field: 'operateTime', width: 130, align: 'center', title: '操作时间'} - , {field: 'operatePerson', width: 120, align: 'center', title: '操作人员'} + // , {field: 'operatePerson', width: 120, align: 'center', title: '操作人员'} ]] ,done: function (res, curr, count) { var state = ""; diff --git a/src/main/resources/static/pages/work/basic/PackageTypeForm.html b/src/main/resources/static/pages/work/basic/PackageTypeForm.html index ce7883e..2ac73b9 100644 --- a/src/main/resources/static/pages/work/basic/PackageTypeForm.html +++ b/src/main/resources/static/pages/work/basic/PackageTypeForm.html @@ -44,22 +44,16 @@
- - +
-
+ \ No newline at end of file