diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 7f4f6b6..51c72c2 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -53,12 +53,12 @@ public class DateUtil { return newEquipmentNo; } - public static void main(String[] args) { + /* public static void main(String[] args) { String dateNumber = getDateNumber("002"); String substring = dateNumber.substring(8, dateNumber.length()); System.out.println(substring); - } + }*/ public static String getymd() { return y_m_d.format(new Date()); } @@ -1663,13 +1663,13 @@ public class DateUtil { return getYmdDate(calendar.getTime()); } - /* public static void main(String[] args) { + public static void main(String[] args) { - Date bir = parseYMD("1990-03-07"); + Date bir = parseYMD("2017-03-08"); Date bir1 = parseYMD("2019-03-08"); - int i = DateUtil.getAge(bir, bir1); + int i = DateUtil.getAge2(bir, bir1); System.out.println(i); - }*/ + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java index eec1614..cfa3a0b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java @@ -5,9 +5,13 @@ import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.service.IReportService; import com.lyms.platform.operate.web.utils.CollectionUtils; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -30,6 +34,10 @@ public class ReportController extends BaseController { private IReportService reportService; @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private UsersService usersService; + @Autowired + private OrganizationService organizationService; /** * 聊城曲线图 @@ -55,7 +63,6 @@ public class ReportController extends BaseController { Integer ageType, Integer patientType, Date startDate, Date endDate, HttpServletRequest request) { return reportService.patients(provinceId, cityId, areaId, streetId, 1, statistVal, ageType, patientType, startDate, endDate, getUserId(request)); } - /** * 建档明细导出 * @param statistType 统计环比 1=周 2=月 3=季度 4=半年 5=年 @@ -68,15 +75,17 @@ public class ReportController extends BaseController { @RequestMapping(value = "/patients/export", method = RequestMethod.GET) public void patientsExport(String provinceId, String cityId, String areaId, String streetId, Integer statistType, Integer ageType, Integer patientType, Date startDate, Date endDate, HttpServletRequest request, HttpServletResponse response) { - String hospitalId = autoMatchFacade.getHospitalId(getUserId(request)); - //衡水导出格式 - if("2100002261".equals(hospitalId)){ - reportService.patientsHsExport(provinceId, cityId, areaId, streetId, statistType, ageType, patientType, startDate, endDate, getUserId(request), response); - - }else { - reportService.patientsExport(provinceId, cityId, areaId, streetId, statistType, ageType, patientType, startDate, endDate, getUserId(request), response); -// reportService.patientsExport(provinceId, cityId, aredId, streetId, statistType, ageType, patientType, startDate, endDate, 1000000185, response); + if(StringUtils.isNotEmpty(hospitalId)){ + Organization organization = organizationService.getOrganization(Integer.valueOf(hospitalId)); + //衡水导出格式 + if(organization!=null && "12".equals(organization.getCityId())){ + reportService.patientsHsExport(provinceId, cityId, areaId, streetId, statistType, ageType, patientType, startDate, endDate, getUserId(request), response); + + }else { + reportService.patientsExport(provinceId, cityId, areaId, streetId, statistType, ageType, patientType, startDate, endDate, getUserId(request), response); + // reportService.patientsExport(provinceId, cityId, aredId, streetId, statistType, ageType, patientType, startDate, endDate, 1000000185, response); + } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 7627b72..92fd2b4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -236,6 +236,7 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setXlrs(request.getXlrs()); model.setXlyy(request.getXlyy()); model.setXlpj(request.getXlpj()); + model.setXlsqxw(request.getXlsqxw()); //结案 /*model.setEndCase(request.getEndCase()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index f31e073..46e79f2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -404,6 +404,40 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient return s1.substring(0,s1.indexOf(".")); } + }else if(StringUtils.isNotEmpty(month) && StringUtils.isNotEmpty(type) && "6".equals(type)){ + int i = 0; + Double count = 0.00; + if(StringUtils.isNotEmpty(ddz)){ + Double ddzd = Double.valueOf(ddz); + count += ddzd; + i++; + } + if(StringUtils.isNotEmpty(sxdz)){ + Double ddzd = Double.valueOf(ddz); + count += ddzd; + i++; + } + if(StringUtils.isNotEmpty(rs)){ + Double rsd = Double.valueOf(rs); + count += rsd; + i++; + } + if(StringUtils.isNotEmpty(yy)){ + Double yyd = Double.valueOf(yy); + count += yyd; + i++; + } + if(StringUtils.isNotEmpty(sqxw)){ + Double sqxwd = Double.valueOf(sqxw); + count += sqxwd; + i++; + } + Double pj = count / i; + if(pj !=null && pj.toString().contains(".")){ + String s1 = pj.toString(); + return s1.substring(0,s1.indexOf(".")); + } + } } catch (NumberFormatException e) { e.printStackTrace(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 39d206e..a2b7efa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -862,6 +862,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService ResponseUtil.responseExcel(cnames, results, response); } + @Override public void patientsHsExport(String provinceId, String cityId, String aredId, String streetId, Integer statistType, Integer ageType, Integer patientType, Date startDate, Date endDate, Integer userId, HttpServletResponse response) { List patients = getPatients(provinceId, cityId, aredId, streetId, ageType, patientType, startDate, endDate, userId); @@ -895,50 +896,58 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService }); Map cnames = new LinkedHashMap<>(); - cnames.put("vcCardNo", "条码号"); - cnames.put("username", "姓名"); + cnames.put("条码号", "条码号"); + cnames.put("姓名", "姓名"); cnames.put("建档年龄", "建档年龄"); - cnames.put("phone", "手机号"); - cnames.put("cardNo", "证件号"); - cnames.put("bookbuildingDate", "建档日期"); - cnames.put("week", "建档孕周"); + cnames.put("手机号", "手机号"); + cnames.put("证件号", "证件号"); + cnames.put("建档日期", "建档日期"); + cnames.put("建档孕周", "建档孕周"); cnames.put("建档机构", "建档机构"); - cnames.put("huji", "户口所在地"); + cnames.put("户口所在地", "户口所在地"); + cnames.put("现住址", "现住址"); - cnames.put("id", "#"); - cnames.put("hospitalName", "医院名称"); - cnames.put("birth", "出生日期"); - cnames.put("age", "年龄"); - cnames.put("huji", "户籍地"); - cnames.put("juzhu", "居住地"); - cnames.put("week", "建档孕周"); - cnames.put("lastMens", "末次月经"); - cnames.put("dueDate", "预产期"); - cnames.put("doctorName", "建档医生"); + cnames.put("产后休养地", "产后休养地"); + cnames.put("丈夫姓名", "丈夫姓名"); + cnames.put("丈夫证件号码", "丈夫证件号码"); + cnames.put("丈夫联系电话", "丈夫联系电话"); + cnames.put("丈夫户口所在地", "丈夫户口所在地"); + cnames.put("结案状态", "结案状态"); List> results = new ArrayList<>(); if (org.apache.commons.collections.CollectionUtils.isNotEmpty(patients)) { int i = 0; for (Patients p : patients) { Map result = new LinkedHashMap<>(); - result.put("id", ++i); - result.put("hospitalName", hNameCache.get(p.getHospitalId())); - result.put("vcCardNo", p.getVcCardNo()); - result.put("username", p.getUsername()); - result.put("birth", DateUtil.getyyyy_MM_dd(p.getBirth())); - result.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(p.getPhone())); - result.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(p.getCardNo())); - result.put("age", DateUtil.getAge(p.getBirth())); - String residenceAddress = findName(p.getProvinceRegisterId()) + findName(p.getCityRegisterId()) + findName(p.getAreaRegisterId()) + findName(p.getStreetRegisterId()) + p.getAddressRegister(); - result.put("juzhu", residenceAddress.replace("null", "")); + result.put("条码号", p.getVcCardNo()); + result.put("姓名", p.getUsername()); + result.put("建档年龄", DateUtil.getAge2(p.getBirth(), p.getBookbuildingDate())); + result.put("手机号", p.getPhone()); + result.put("证件号", p.getCardNo()); + result.put("建档日期", DateUtil.getyyyy_MM_dd(p.getBookbuildingDate())); + result.put("建档孕周", DateUtil.getWeekDesc(p.getLastMenses(), p.getBookbuildingDate())); + result.put("建档机构", hNameCache.get(p.getHospitalId())); String householdAddress = findName(p.getProvinceId()) + findName(p.getCityId()) + findName(p.getAreaId()) + findName(p.getStreetId()) + p.getAddress(); - result.put("huji", householdAddress.replace("null", "")); - - result.put("week", DateUtil.getWeekDesc(p.getLastMenses(), p.getBookbuildingDate())); - result.put("lastMens", DateUtil.getyyyy_MM_dd(p.getLastMenses())); - result.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); - result.put("bookbuildingDate", DateUtil.getyyyy_MM_dd(p.getBookbuildingDate())); - result.put("doctorName", userNameCache.get(p.getBookbuildingDoctor())); + result.put("户口所在地", householdAddress.replace("null", "")); + String residenceAddress = findName(p.getProvinceRegisterId()) + findName(p.getCityRegisterId()) + findName(p.getAreaRegisterId()) + findName(p.getStreetRegisterId()) + p.getAddressRegister(); + result.put("现住址", residenceAddress.replace("null", "")); + String provinceAddress = findName(p.getProvincePostRestId()) + findName(p.getCityPostRestId()) + + findName(p.getAreaPostRestId()) + findName(p.getStreetPostRestId()) + p.getAddressPostRest(); + result.put("产后休养地", provinceAddress.replace("null", "")); + result.put("丈夫姓名", p.getHusbandName()); + result.put("丈夫证件号码", p.getHcertificateNum()); + result.put("丈夫联系电话", p.getHusbandPhone()); + String hAddress = findName(p.getHprovinceRegisterId()) + findName(p.getHcityRegisterId()) + + findName(p.getHareaRegisterId()) + findName(p.getHstreetRegisterId()) + p.getHaddressRegister(); + result.put("丈夫户口所在地", hAddress.replace("null", "")); + //孕妇状态显示当前孕周 + if ("1".equals(p.getType())) { + result.put("结案状态", DateUtil.getWeekDesc(p.getLastMenses(),new Date())); + }else if ("3".equals(p.getType())){ + result.put("结案状态", "分娩"); + }else { + result.put("结案状态", ""); + } results.add(result); } }