From 68b49efb4da346edb42a5d8ebb39af47207402bd Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 12 十月 2026 11:14:13 +0800
Subject: [PATCH] 修改了报销校验
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 469 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 280 insertions(+), 189 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
index b3de399..879f517 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.project;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
@@ -13,9 +14,12 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
+import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
+import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.project.service.IServiceExternalpersonService;
import com.ruoyi.system.mapper.SysDeptMapper;
import freemarker.template.Configuration;
@@ -23,14 +27,16 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.io.*;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.*;
-
-//import javafx.scene.input.DataFormat;
/**
@@ -39,6 +45,7 @@
* @author ruoyi
* @date 2021-11-10
*/
+@Slf4j
@Api("娼滃湪鎹愮尞淇℃伅绠＄悊")
@RestController
@RequestMapping("/project/donatebaseinfo")
@@ -47,10 +54,10 @@
private IServiceDonatebaseinfoService serviceDonatebaseinfoService;
@Autowired
- private IServiceExternalpersonService serviceExternalpersonService;
+ private IServiceDonationwitnessService serviceDonationwitnessService;
@Autowired
- private ServerConfig serverConfig;
+ private IServiceExternalpersonService serviceExternalpersonService;
@Autowired
private SysDeptMapper sysDeptMapper;
@@ -67,32 +74,45 @@
* 鏌ヨ鎹愮尞鍩虹鍒楄〃
*/
@ApiOperation("娼滃湪鎹愮尞淇℃伅鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
startPage();
- //List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鏌ヨ娼滃湪鎹愮尞鎮ｈ�呬俊鎭垪琛ㄤ笉涓巄ase_organization鍏宠仈
+ */
+ @ApiOperation("娼滃湪鎹愮尞鎮ｈ�呬俊鎭垪琛�")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
+ @GetMapping("/getpatname")
+ public TableDataInfo getPatName(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("娼滃湪鎹愮尞鎮ｈ�呬俊鎭垪琛細{}", serviceDonatebaseinfo);
+ List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.getPatName(serviceDonatebaseinfo);
return getDataTable(list);
}
@ApiOperation("灏忕▼搴忕娼滃湪鎹愮尞淇℃伅鍒楄〃")
@GetMapping("/listForSearch")
public TableDataInfo listForSearch(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("灏忕▼搴忕娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
startPage();
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.listForSearch(serviceDonatebaseinfo);
return getDataTable(list);
}
-
/**
* 瀵煎嚭鎹愮尞鍩虹鍒楄〃
*/
@ApiOperation("瀵煎嚭娼滃湪鎹愮尞淇℃伅鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:export')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("瀵煎嚭娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
ExcelUtil<ServiceDonatebaseinfo> util = new ExcelUtil<ServiceDonatebaseinfo>(ServiceDonatebaseinfo.class);
return util.exportExcel(list, "鎹愮尞鍩虹鏁版嵁");
@@ -102,36 +122,57 @@
* 鑾峰彇鎹愮尞鍩虹璇︾粏淇℃伅
*/
@ApiOperation("閫氳繃id鑾峰緱娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- return AjaxResult.success(serviceDonatebaseinfoService.getById(id));
+ log.info("閫氳繃id鑾峰緱娼滃湪鎹愮尞淇℃伅锛歿}", id);
+ ServiceDonatebaseinfo serviceDonatebaseinfo = serviceDonatebaseinfoService.getById(id);
+ if (serviceDonatebaseinfo.getBirthday() != null) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
+ serviceDonatebaseinfo.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ serviceDonatebaseinfo.setAgeunit(map.get("ageUnit"));
+ serviceDonatebaseinfo.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ serviceDonatebaseinfo.setAgeunit2(map.get("ageUnit2"));
+ }
+
+ serviceDonatebaseinfo.setAgeunit("-");
+ serviceDonatebaseinfo.setAge(null);
+ serviceDonatebaseinfo.setAge2(null);
+
+ //鑾峰彇姝讳骸鏃堕棿锛屽鏋滆幏鍙栬璇侀噷鏈夋浜℃椂闂达紝鍒欒繘琛岃绠椾粬鐨勫勾榫�
+ ServiceDonationwitness sdw = new ServiceDonationwitness();
+ sdw.setInfoid(serviceDonatebaseinfo.getId());
+ List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessService.selectServiceDonationwitnessList(sdw);
+ if (!CollectionUtils.isEmpty(serviceDonationwitnessList) && serviceDonatebaseinfo.getBirthday() != null) {
+ Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
+ if (ObjectUtils.isNotEmpty(deathtime)) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
+ if (Objects.isNull(map)) {
+ log.error("serviceDonatebaseinfo鍑虹敓鏃ユ湡锛歿},serviceDonatebaseinfo姝讳骸鏃ユ湡锛歿}", serviceDonatebaseinfo.getBirthday(), deathtime);
+ }
+ serviceDonatebaseinfo.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ serviceDonatebaseinfo.setAgeunit(map.get("ageUnit"));
+ serviceDonatebaseinfo.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ serviceDonatebaseinfo.setAgeunit2(map.get("ageUnit2"));
+ }
+ }
+
+
+ return AjaxResult.success(serviceDonatebaseinfo);
}
/**
* 鏂板鎹愮尞鍩虹
*/
@ApiOperation("鏂板娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:add')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("鏂板娼滃湪鎹愮尞淇℃伅锛歿}", serviceDonatebaseinfo);
SysUser user = SecurityUtils.getLoginUser().getUser();
- String bh = "";
- bh = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
- if (bh == "") {
- return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿涓虹┖,鍒涘缓澶辫触!");
- } else {
- ServiceDonatebaseinfo serviceDonatebaseinfo1 = new ServiceDonatebaseinfo();
- serviceDonatebaseinfo1.setDonorno(bh);
- List<ServiceDonatebaseinfo> listrecord = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo1);
- if (listrecord.size() > 0) {
- return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿" + bh + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
- }
-
- }
String idcardno = serviceDonatebaseinfo.getIdcardno();
ServiceDonatebaseinfo serviceDonatebaseinfo2 = new ServiceDonatebaseinfo();
serviceDonatebaseinfo2.setIdcardno(idcardno);
@@ -140,23 +181,25 @@
return AjaxResult.error("鏂板鏃惰韩浠借瘉" + idcardno + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
}
-
- serviceDonatebaseinfo.setDonorno(bh);
+ // serviceDonatebaseinfo.setDonorno(bh);
serviceDonatebaseinfo.setDeptid(user.getDeptId());
serviceDonatebaseinfo.setDeptname(sysDeptMapper.getDeptNameByDeptId(user.getDeptId()));
-
- return toAjax(serviceDonatebaseinfoService.save(serviceDonatebaseinfo));
+ serviceDonatebaseinfoService.save(serviceDonatebaseinfo);
+ Map<String, Long> map = new HashMap<>();
+ map.put("id", serviceDonatebaseinfo.getId());
+ return AjaxResult.success(map);
}
/**
* 淇敼鎹愮尞鍩虹
*/
@ApiOperation("淇敼娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("淇敼娼滃湪鎹愮尞淇℃伅锛歿}", serviceDonatebaseinfo);
return toAjax(serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo));
}
@@ -164,16 +207,18 @@
* 鍒犻櫎鎹愮尞鍩虹
*/
@ApiOperation("鍒犻櫎娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎娼滃湪鎹愮尞淇℃伅锛歿}", ids);
return toAjax(serviceDonatebaseinfoService.removeByIds(Arrays.asList(ids)));
}
@ApiOperation("鑾峰彇鎹愮尞缂栧彿")
- @GetMapping("/donatenumber")
- public AjaxResult getDonateNumber(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ @PostMapping("/donatenumber")
+ public AjaxResult getDonateNumber(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("鑾峰彇鎹愮尞缂栧彿锛歿}", serviceDonatebaseinfo);
return AjaxResult.success(serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo));
}
@@ -181,11 +226,13 @@
@ApiOperation("鑾峰彇鎹愮尞鎶ュ憡浜�")
@GetMapping("/reportName/{usertype}")
public AjaxResult getReportName(@PathVariable("usertype") String usertype) {
+ log.info("鑾峰彇鎹愮尞鎶ュ憡浜猴細{}", usertype);
return AjaxResult.success(serviceExternalpersonService.getReportName(usertype));
}
@GetMapping(value = "/updateS1S2S3S4/{id}")
public AjaxResult updateS1S2S3S4(@PathVariable Long id) {
+ log.info("updateS1S2S3S4鐨勫叆鍙傦細{}", id);
return AjaxResult.success(serviceDonatebaseinfoService.updateS1S2S3S4(id));
}
@@ -195,6 +242,7 @@
@ApiOperation("閫氳繃id涓嬭浇浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃")
@GetMapping(value = "/download/{id}")
public Map downloadInfo(@PathVariable("id") Long id) throws IOException {
+ log.info("閫氳繃id涓嬭浇浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃锛歿}", id);
Map dataMap = new HashMap();
getData(dataMap, id);
String filePath = getClass().getResource("/template/").getPath();
@@ -214,21 +262,20 @@
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
- Writer out = null;
-
- try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
-
- } catch (FileNotFoundException e1) {
- e1.printStackTrace();
+ if (t == null) {
+ throw new ServiceException("妯℃澘鍔犺浇澶辫触锛岃妫�鏌ユā鏉挎枃浠舵槸鍚﹀瓨鍦�", HttpStatus.NO_CONTENT);
}
- try {
+
+ // Writer 蹇呴』鍏抽棴/鍒锋柊锛欱ufferedWriter 甯︾紦鍐诧紝涓嶅叧闂細瀵艰嚧鐢熸垚鐨� doc 鍐呭涓嶅畬鏁�
+ try (Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"))) {
t.process(dataMap, out);
- } catch (TemplateException e) {
- e.printStackTrace();
+ } catch (TemplateException | IOException e) {
+ log.error("鐢熸垚妯℃澘鏂囨。澶辫触, name={}", name, e);
+ throw new ServiceException("鐢熸垚鏂囨。澶辫触", HttpStatus.ERROR);
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -243,44 +290,56 @@
throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT);
}
+ // 浠ヤ笅瀛楁鍦ㄦ暟鎹簱涓潎鍙负绌猴紝缁熶竴鍙栫┖涓插厹搴曪紝閬垮厤鎷艰妯℃澘鏃舵姏绌烘寚閽堝紓甯�
+ String diseasetype = serviceDonatebaseinfo.getDiseasetype() == null ? "" : serviceDonatebaseinfo.getDiseasetype();
+ String infectious = serviceDonatebaseinfo.getInfectious() == null ? "" : serviceDonatebaseinfo.getInfectious();
+ String infosources = serviceDonatebaseinfo.getInfosources() == null ? "" : serviceDonatebaseinfo.getInfosources();
+ String selfwill = serviceDonatebaseinfo.getSelfwill() == null ? "" : serviceDonatebaseinfo.getSelfwill();
+ String othercases = serviceDonatebaseinfo.getOthercases() == null ? "" : serviceDonatebaseinfo.getOthercases();
+ String kinship = serviceDonatebaseinfo.getKinship() == null ? "" : serviceDonatebaseinfo.getKinship();
+ String patientstate = serviceDonatebaseinfo.getPatientstate() == null ? "" : serviceDonatebaseinfo.getPatientstate();
+
dataMap.put("JXBH", serviceDonatebaseinfo.getDonorno() == null ? "" : serviceDonatebaseinfo.getDonorno());
dataMap.put("SZYLJG", serviceDonatebaseinfo.getTreatmenthospitalname() == null ? "" : serviceDonatebaseinfo.getTreatmenthospitalname());
dataMap.put("KS", serviceDonatebaseinfo.getTreatmentdeptname() == null ? "" : serviceDonatebaseinfo.getTreatmentdeptname());
dataMap.put("XM", serviceDonatebaseinfo.getName() == null ? "" : serviceDonatebaseinfo.getName());
- if (serviceDonatebaseinfo.getSex().equals("0")) {
+ if ("0".equals(serviceDonatebaseinfo.getSex())) {
dataMap.put("XB", "鏈煡鐨勬�у埆");
- } else if (serviceDonatebaseinfo.getSex().equals("1")) {
+ } else if ("1".equals(serviceDonatebaseinfo.getSex())) {
dataMap.put("XB", "鐢�");
- } else if (serviceDonatebaseinfo.getSex().equals("2")) {
+ } else if ("2".equals(serviceDonatebaseinfo.getSex())) {
dataMap.put("XB", "濂�");
}
- Date dt = serviceDonatebaseinfo.getBirthday();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String date = formatter.format(dt);
- String time = date.substring(0, 10);
- dataMap.put("CSRQ", serviceDonatebaseinfo.getBirthday() == null ? "" : time);
+ String csrq = "";
+ if (serviceDonatebaseinfo.getBirthday() != null) {
+ csrq = formatter.format(serviceDonatebaseinfo.getBirthday()).substring(0, 10);
+ }
+ dataMap.put("CSRQ", csrq);
dataMap.put("GJ", serviceDonatebaseinfo.getNationality() == null ? "" : serviceDonatebaseinfo.getNationality());
- if (serviceDonatebaseinfo.getIdcardtype() == 1) {
+ // idcardtype 涓哄寘瑁呯被鍨� Long锛屾暟鎹簱涓彲涓� NULL锛涘厛鍙栧�煎啀鍒ゆ柇锛岄伩鍏嶈嚜鍔ㄦ媶绠辨姏绌烘寚閽�
+ Long idcardtype = serviceDonatebaseinfo.getIdcardtype();
+ if (idcardtype != null && idcardtype == 1) {
dataMap.put("ZJLX", "韬唤璇�");
- } else if (serviceDonatebaseinfo.getIdcardtype() == 2) {
+ } else if (idcardtype != null && idcardtype == 2) {
dataMap.put("ZJLX", "鍐涗汉璇�");
- } else if (serviceDonatebaseinfo.getIdcardtype() == 3) {
+ } else if (idcardtype != null && idcardtype == 3) {
dataMap.put("ZJLX", "鎶ょ収");
- } else if (serviceDonatebaseinfo.getIdcardtype() == 4) {
+ } else if (idcardtype != null && idcardtype == 4) {
dataMap.put("ZJLX", "鎴峰彛鏈�");
- } else if (serviceDonatebaseinfo.getIdcardtype() == 5) {
+ } else if (idcardtype != null && idcardtype == 5) {
dataMap.put("ZJLX", "澶栧浗浜烘案涔呭眳浣忚瘉");
- } else if (serviceDonatebaseinfo.getIdcardtype() == 6) {
+ } else if (idcardtype != null && idcardtype == 6) {
dataMap.put("ZJLX", "姝﹁璇�");
- } else if (serviceDonatebaseinfo.getIdcardtype() == 10) {
+ } else if (idcardtype != null && idcardtype == 10) {
dataMap.put("ZJLX", "瀛︾敓璇�");
- } else if (serviceDonatebaseinfo.getIdcardtype() == 11) {
+ } else if (idcardtype != null && idcardtype == 11) {
dataMap.put("ZJLX", "澹叺璇�");
- } else if (serviceDonatebaseinfo.getIdcardtype() == 16) {
+ } else if (idcardtype != null && idcardtype == 16) {
dataMap.put("ZJLX", "娓境灞呮皯鏉ュ線鍐呭湴閫氳璇�");
- } else if (serviceDonatebaseinfo.getIdcardtype() == 17) {
+ } else if (idcardtype != null && idcardtype == 17) {
dataMap.put("ZJLX", "鍙版咕灞呮皯鏉ュ線澶ч檰閫氳璇�");
- } else if (serviceDonatebaseinfo.getIdcardtype() == 18) {
+ } else if (idcardtype != null && idcardtype == 18) {
dataMap.put("ZJLX", "鍏朵粬璇佷欢绫诲瀷");
}
dataMap.put("ZJHM", serviceDonatebaseinfo.getIdcardno() == null ? "" : serviceDonatebaseinfo.getIdcardno());
@@ -297,28 +356,28 @@
dataMap.put("ZYH", serviceDonatebaseinfo.getInpatientno() == null ? "" : serviceDonatebaseinfo.getInpatientno());
- if (serviceDonatebaseinfo.getBloodtype().equals("1")) {
+ if ("1".equals(serviceDonatebaseinfo.getBloodtype())) {
dataMap.put("XXA", (char) 8730);
dataMap.put("XXB", "鈻�");
dataMap.put("XXO", "鈻�");
dataMap.put("XXAB", "鈻�");
- } else if (serviceDonatebaseinfo.getBloodtype().equals("2")) {
+ } else if ("2".equals(serviceDonatebaseinfo.getBloodtype())) {
dataMap.put("XXA", "鈻�");
dataMap.put("XXB", (char) 8730);
dataMap.put("XXO", "鈻�");
dataMap.put("XXAB", "鈻�");
- } else if (serviceDonatebaseinfo.getBloodtype().equals("3")) {
+ } else if ("3".equals(serviceDonatebaseinfo.getBloodtype())) {
dataMap.put("XXA", "鈻�");
dataMap.put("XXB", "鈻�");
dataMap.put("XXO", (char) 8730);
dataMap.put("XXAB", "鈻�");
- } else if (serviceDonatebaseinfo.getBloodtype().equals("4")) {
+ } else if ("4".equals(serviceDonatebaseinfo.getBloodtype())) {
dataMap.put("XXA", "鈻�");
dataMap.put("XXB", "鈻�");
dataMap.put("XXO", "鈻�");
dataMap.put("XXAB", (char) 8730);
}
- if (serviceDonatebaseinfo.getRhyin().equals("1")) {
+ if ("1".equals(serviceDonatebaseinfo.getRhyin())) {
dataMap.put("YX", (char) 8730);
} else {
dataMap.put("YX", "鈻�");
@@ -327,22 +386,22 @@
dataMap.put("JBZD", serviceDonatebaseinfo.getDiagnosisname() == null ? "" : serviceDonatebaseinfo.getDiagnosisname());
//鐤剧梾绫诲瀷
- if (serviceDonatebaseinfo.getDiseasetype().contains("0")) {
+ if (diseasetype.contains("0")) {
dataMap.put("NXGYW", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("1")) {
+ if (diseasetype.contains("1")) {
dataMap.put("NWS", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("2")) {
+ if (diseasetype.contains("2")) {
dataMap.put("QXQY", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+ if (diseasetype.contains("3")) {
dataMap.put("NZL", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
}
} else {
dataMap.put("NZL", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
@@ -350,16 +409,16 @@
}
} else {
dataMap.put("QXQY", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+ if (diseasetype.contains("3")) {
dataMap.put("NZL", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
}
} else {
dataMap.put("NZL", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
@@ -368,18 +427,18 @@
}
} else {
dataMap.put("NWS", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("2")) {
+ if (diseasetype.contains("2")) {
dataMap.put("QXQY", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+ if (diseasetype.contains("3")) {
dataMap.put("NZL", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
}
} else {
dataMap.put("NZL", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
@@ -387,16 +446,16 @@
}
} else {
dataMap.put("QXQY", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+ if (diseasetype.contains("3")) {
dataMap.put("NZL", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
}
} else {
dataMap.put("NZL", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
@@ -406,20 +465,20 @@
}
} else {
dataMap.put("NXGYW", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("1")) {
+ if (diseasetype.contains("1")) {
dataMap.put("NWS", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("2")) {
+ if (diseasetype.contains("2")) {
dataMap.put("QXQY", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+ if (diseasetype.contains("3")) {
dataMap.put("NZL", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
}
} else {
dataMap.put("NZL", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
@@ -427,16 +486,16 @@
}
} else {
dataMap.put("QXQY", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+ if (diseasetype.contains("3")) {
dataMap.put("NZL", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
}
} else {
dataMap.put("NZL", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
@@ -445,18 +504,18 @@
}
} else {
dataMap.put("NWS", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("2")) {
+ if (diseasetype.contains("2")) {
dataMap.put("QXQY", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+ if (diseasetype.contains("3")) {
dataMap.put("NZL", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
}
} else {
dataMap.put("NZL", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
@@ -464,16 +523,16 @@
}
} else {
dataMap.put("QXQY", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+ if (diseasetype.contains("3")) {
dataMap.put("NZL", (char) 8730);
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
}
} else {
dataMap.put("NZL", "鈻�");
- if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+ if (diseasetype.contains("4")) {
dataMap.put("XXGJB", (char) 8730);
} else {
dataMap.put("XXGJB", "鈻�");
@@ -487,20 +546,20 @@
//浼犳煋鐥呮儏鍐�
- if (serviceDonatebaseinfo.getInfectious().contains("1")) {
+ if (infectious.contains("1")) {
dataMap.put("YG", (char) 8730);
- if (serviceDonatebaseinfo.getInfectious().contains("2")) {
+ if (infectious.contains("2")) {
dataMap.put("BG", (char) 8730);
- if (serviceDonatebaseinfo.getInfectious().contains("3")) {
+ if (infectious.contains("3")) {
dataMap.put("MD", (char) 8730);
- if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+ if (infectious.contains("4")) {
dataMap.put("AZB", (char) 8730);
} else {
dataMap.put("AZB", "鈻�");
}
} else {
dataMap.put("MD", "鈻�");
- if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+ if (infectious.contains("4")) {
dataMap.put("AZB", (char) 8730);
} else {
dataMap.put("AZB", "鈻�");
@@ -508,16 +567,16 @@
}
} else {
dataMap.put("BG", "鈻�");
- if (serviceDonatebaseinfo.getInfectious().contains("3")) {
+ if (infectious.contains("3")) {
dataMap.put("MD", (char) 8730);
- if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+ if (infectious.contains("4")) {
dataMap.put("AZB", (char) 8730);
} else {
dataMap.put("AZB", "鈻�");
}
} else {
dataMap.put("MD", "鈻�");
- if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+ if (infectious.contains("4")) {
dataMap.put("AZB", (char) 8730);
} else {
dataMap.put("AZB", "鈻�");
@@ -526,18 +585,18 @@
}
} else {
dataMap.put("YG", "鈻�");
- if (serviceDonatebaseinfo.getInfectious().contains("2")) {
+ if (infectious.contains("2")) {
dataMap.put("BG", (char) 8730);
- if (serviceDonatebaseinfo.getInfectious().contains("3")) {
+ if (infectious.contains("3")) {
dataMap.put("MD", (char) 8730);
- if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+ if (infectious.contains("4")) {
dataMap.put("AZB", (char) 8730);
} else {
dataMap.put("AZB", "鈻�");
}
} else {
dataMap.put("MD", "鈻�");
- if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+ if (infectious.contains("4")) {
dataMap.put("AZB", (char) 8730);
} else {
dataMap.put("AZB", "鈻�");
@@ -545,16 +604,16 @@
}
} else {
dataMap.put("BG", "鈻�");
- if (serviceDonatebaseinfo.getInfectious().contains("3")) {
+ if (infectious.contains("3")) {
dataMap.put("MD", (char) 8730);
- if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+ if (infectious.contains("4")) {
dataMap.put("AZB", (char) 8730);
} else {
dataMap.put("AZB", "鈻�");
}
} else {
dataMap.put("MD", "鈻�");
- if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+ if (infectious.contains("4")) {
dataMap.put("AZB", (char) 8730);
} else {
dataMap.put("AZB", "鈻�");
@@ -564,16 +623,16 @@
}
dataMap.put("CRBQT", serviceDonatebaseinfo.getInfectiousOther() == null ? "" : serviceDonatebaseinfo.getInfectiousOther());
//鐥呬汉鐘跺喌
- if (serviceDonatebaseinfo.getPatientstate().contains("0")) {
+ if (patientstate.contains("0")) {
dataMap.put("SDHM", (char) 8730);
- if (serviceDonatebaseinfo.getPatientstate().contains("1")) {
+ if (patientstate.contains("1")) {
dataMap.put("WZZHX", (char) 8730);
} else {
dataMap.put("WZZHX", "鈻�");
}
} else {
dataMap.put("SDHM", "鈻�");
- if (serviceDonatebaseinfo.getPatientstate().contains("1")) {
+ if (patientstate.contains("1")) {
dataMap.put("WZZHX", (char) 8730);
} else {
dataMap.put("WZZHX", "鈻�");
@@ -581,20 +640,20 @@
}
//鍏朵粬鎯呭喌
- if (serviceDonatebaseinfo.getOthercases().contains("0")) {
+ if (othercases.contains("0")) {
dataMap.put("JTSG", (char) 8730);
- if (serviceDonatebaseinfo.getOthercases().contains("1")) {
+ if (othercases.contains("1")) {
dataMap.put("XSAJ", (char) 8730);
- if (serviceDonatebaseinfo.getOthercases().contains("2")) {
+ if (othercases.contains("2")) {
dataMap.put("GSSG", (char) 8730);
- if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+ if (othercases.contains("3")) {
dataMap.put("QTYWSG", (char) 8730);
} else {
dataMap.put("QTYWSG", "鈻�");
}
} else {
dataMap.put("GSSG", "鈻�");
- if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+ if (othercases.contains("3")) {
dataMap.put("QTYWSG", (char) 8730);
} else {
dataMap.put("QTYWSG", "鈻�");
@@ -602,16 +661,16 @@
}
} else {
dataMap.put("XSAJ", "鈻�");
- if (serviceDonatebaseinfo.getOthercases().contains("2")) {
+ if (othercases.contains("2")) {
dataMap.put("GSSG", (char) 8730);
- if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+ if (othercases.contains("3")) {
dataMap.put("QTYWSG", (char) 8730);
} else {
dataMap.put("QTYWSG", "鈻�");
}
} else {
dataMap.put("GSSG", "鈻�");
- if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+ if (othercases.contains("3")) {
dataMap.put("QTYWSG", (char) 8730);
} else {
dataMap.put("QTYWSG", "鈻�");
@@ -620,18 +679,18 @@
}
} else {
dataMap.put("JTSG", "鈻�");
- if (serviceDonatebaseinfo.getOthercases().contains("1")) {
+ if (othercases.contains("1")) {
dataMap.put("XSAJ", (char) 8730);
- if (serviceDonatebaseinfo.getOthercases().contains("2")) {
+ if (othercases.contains("2")) {
dataMap.put("GSSG", (char) 8730);
- if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+ if (othercases.contains("3")) {
dataMap.put("QTYWSG", (char) 8730);
} else {
dataMap.put("QTYWSG", "鈻�");
}
} else {
dataMap.put("GSSG", "鈻�");
- if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+ if (othercases.contains("3")) {
dataMap.put("QTYWSG", (char) 8730);
} else {
dataMap.put("QTYWSG", "鈻�");
@@ -639,16 +698,16 @@
}
} else {
dataMap.put("XSAJ", "鈻�");
- if (serviceDonatebaseinfo.getOthercases().contains("2")) {
+ if (othercases.contains("2")) {
dataMap.put("GSSG", (char) 8730);
- if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+ if (othercases.contains("3")) {
dataMap.put("QTYWSG", (char) 8730);
} else {
dataMap.put("QTYWSG", "鈻�");
}
} else {
dataMap.put("GSSG", "鈻�");
- if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+ if (othercases.contains("3")) {
dataMap.put("QTYWSG", (char) 8730);
} else {
dataMap.put("QTYWSG", "鈻�");
@@ -658,20 +717,20 @@
}
//鎯呬翰灞炲叧绯绘儏鍐�
- if (serviceDonatebaseinfo.getKinship().contains("0")) {
+ if (kinship.contains("0")) {
dataMap.put("PE", (char) 8730);
- if (serviceDonatebaseinfo.getKinship().contains("1")) {
+ if (kinship.contains("1")) {
dataMap.put("ZN", (char) 8730);
- if (serviceDonatebaseinfo.getKinship().contains("2")) {
+ if (kinship.contains("2")) {
dataMap.put("FQ", (char) 8730);
- if (serviceDonatebaseinfo.getKinship().contains("3")) {
+ if (kinship.contains("3")) {
dataMap.put("MQ", (char) 8730);
} else {
dataMap.put("MQ", "鈻�");
}
} else {
dataMap.put("FQ", "鈻�");
- if (serviceDonatebaseinfo.getKinship().contains("3")) {
+ if (kinship.contains("3")) {
dataMap.put("MQ", (char) 8730);
} else {
dataMap.put("MQ", "鈻�");
@@ -679,16 +738,16 @@
}
} else {
dataMap.put("ZN", "鈻�");
- if (serviceDonatebaseinfo.getKinship().contains("2")) {
+ if (kinship.contains("2")) {
dataMap.put("FQ", (char) 8730);
- if (serviceDonatebaseinfo.getKinship().contains("3")) {
+ if (kinship.contains("3")) {
dataMap.put("MQ", (char) 8730);
} else {
dataMap.put("MQ", "鈻�");
}
} else {
dataMap.put("FQ", "鈻�");
- if (serviceDonatebaseinfo.getKinship().contains("3")) {
+ if (kinship.contains("3")) {
dataMap.put("MQ", (char) 8730);
} else {
dataMap.put("MQ", "鈻�");
@@ -697,18 +756,18 @@
}
} else {
dataMap.put("PE", "鈻�");
- if (serviceDonatebaseinfo.getKinship().contains("1")) {
+ if (kinship.contains("1")) {
dataMap.put("ZN", (char) 8730);
- if (serviceDonatebaseinfo.getKinship().contains("2")) {
+ if (kinship.contains("2")) {
dataMap.put("FQ", (char) 8730);
- if (serviceDonatebaseinfo.getKinship().contains("3")) {
+ if (kinship.contains("3")) {
dataMap.put("MQ", (char) 8730);
} else {
dataMap.put("MQ", "鈻�");
}
} else {
dataMap.put("FQ", "鈻�");
- if (serviceDonatebaseinfo.getKinship().contains("3")) {
+ if (kinship.contains("3")) {
dataMap.put("MQ", (char) 8730);
} else {
dataMap.put("MQ", "鈻�");
@@ -716,16 +775,16 @@
}
} else {
dataMap.put("ZN", "鈻�");
- if (serviceDonatebaseinfo.getKinship().contains("2")) {
+ if (kinship.contains("2")) {
dataMap.put("FQ", (char) 8730);
- if (serviceDonatebaseinfo.getKinship().contains("3")) {
+ if (kinship.contains("3")) {
dataMap.put("MQ", (char) 8730);
} else {
dataMap.put("MQ", "鈻�");
}
} else {
dataMap.put("FQ", "鈻�");
- if (serviceDonatebaseinfo.getKinship().contains("3")) {
+ if (kinship.contains("3")) {
dataMap.put("MQ", (char) 8730);
} else {
dataMap.put("MQ", "鈻�");
@@ -736,20 +795,20 @@
dataMap.put("QSQT", serviceDonatebaseinfo.getKinshipOther() == null ? "" : serviceDonatebaseinfo.getKinshipOther());
//鏈汉鎹愮尞
- if (serviceDonatebaseinfo.getSelfwill().contains("0")) {
+ if (selfwill.contains("0")) {
dataMap.put("ZYDJ", (char) 8730);
- if (serviceDonatebaseinfo.getSelfwill().contains("1")) {
+ if (selfwill.contains("1")) {
dataMap.put("SMTY", (char) 8730);
- if (serviceDonatebaseinfo.getSelfwill().contains("2")) {
+ if (selfwill.contains("2")) {
dataMap.put("KTTY", (char) 8730);
- if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+ if (selfwill.contains("3")) {
dataMap.put("WBSBTY", (char) 8730);
} else {
dataMap.put("WBSBTY", "鈻�");
}
} else {
dataMap.put("KTTY", "鈻�");
- if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+ if (selfwill.contains("3")) {
dataMap.put("WBSBTY", (char) 8730);
} else {
dataMap.put("WBSBTY", "鈻�");
@@ -757,16 +816,16 @@
}
} else {
dataMap.put("SMTY", "鈻�");
- if (serviceDonatebaseinfo.getSelfwill().contains("2")) {
+ if (selfwill.contains("2")) {
dataMap.put("KTTY", (char) 8730);
- if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+ if (selfwill.contains("3")) {
dataMap.put("WBSBTY", (char) 8730);
} else {
dataMap.put("WBSBTY", "鈻�");
}
} else {
dataMap.put("KTTY", "鈻�");
- if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+ if (selfwill.contains("3")) {
dataMap.put("WBSBTY", (char) 8730);
} else {
dataMap.put("WBSBTY", "鈻�");
@@ -775,18 +834,18 @@
}
} else {
dataMap.put("ZYDJ", "鈻�");
- if (serviceDonatebaseinfo.getSelfwill().contains("1")) {
+ if (selfwill.contains("1")) {
dataMap.put("SMTY", (char) 8730);
- if (serviceDonatebaseinfo.getSelfwill().contains("2")) {
+ if (selfwill.contains("2")) {
dataMap.put("KTTY", (char) 8730);
- if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+ if (selfwill.contains("3")) {
dataMap.put("WBSBTY", (char) 8730);
} else {
dataMap.put("WBSBTY", "鈻�");
}
} else {
dataMap.put("KTTY", "鈻�");
- if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+ if (selfwill.contains("3")) {
dataMap.put("WBSBTY", (char) 8730);
} else {
dataMap.put("WBSBTY", "鈻�");
@@ -794,16 +853,16 @@
}
} else {
dataMap.put("SMTY", "鈻�");
- if (serviceDonatebaseinfo.getSelfwill().contains("2")) {
+ if (selfwill.contains("2")) {
dataMap.put("KTTY", (char) 8730);
- if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+ if (selfwill.contains("3")) {
dataMap.put("WBSBTY", (char) 8730);
} else {
dataMap.put("WBSBTY", "鈻�");
}
} else {
dataMap.put("KTTY", "鈻�");
- if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+ if (selfwill.contains("3")) {
dataMap.put("WBSBTY", (char) 8730);
} else {
dataMap.put("WBSBTY", "鈻�");
@@ -812,40 +871,47 @@
}
}
dataMap.put("ZYQS", serviceDonatebaseinfo.getMajorrelatives() == null ? "" : serviceDonatebaseinfo.getMajorrelatives());
- dataMap.put("YJXZGX", serviceDonatebaseinfo.getFamilyrelations() == null ? "" : serviceDonatebaseinfo.getFamilyrelations());
+// dataMap.put("YJXZGX", serviceDonatebaseinfo.getFamilyrelations() == null ? "" : serviceDonatebaseinfo.getFamilyrelations());
if (serviceDonatebaseinfo.getFamilyrelations() == null) {
dataMap.put("YJXZGX", "");
- } else if (serviceDonatebaseinfo.getFamilyrelations().equals("0")) {
- dataMap.put("YJXZGX", "鏈汉");
- } else if (serviceDonatebaseinfo.getFamilyrelations().equals("1")) {
+ } else if (serviceDonatebaseinfo.getFamilyrelations().equals("0")) {
dataMap.put("YJXZGX", "閰嶅伓");
+ } else if (serviceDonatebaseinfo.getFamilyrelations().equals("1")) {
+ dataMap.put("YJXZGX", "鐖跺瓙");
} else if (serviceDonatebaseinfo.getFamilyrelations().equals("2")) {
- dataMap.put("YJXZGX", "瀛�");
+ dataMap.put("YJXZGX", "鐖跺コ");
} else if (serviceDonatebaseinfo.getFamilyrelations().equals("3")) {
- dataMap.put("YJXZGX", "濂�");
+ dataMap.put("YJXZGX", "姣嶅瓙");
} else if (serviceDonatebaseinfo.getFamilyrelations().equals("4")) {
- dataMap.put("YJXZGX", "鐖舵瘝");
+ dataMap.put("YJXZGX", "姣嶅コ");
} else if (serviceDonatebaseinfo.getFamilyrelations().equals("5")) {
- dataMap.put("YJXZGX", "鐖风埛");
- } else if (serviceDonatebaseinfo.getFamilyrelations().equals("6")) {
- dataMap.put("YJXZGX", "鍏朵粬");
+ dataMap.put("YJXZGX", "鍏勫紵濮愬");
+ }else if (serviceDonatebaseinfo.getFamilyrelations().equals("6")) {
+ dataMap.put("YJXZGX", "濮愬");
+ }else if (serviceDonatebaseinfo.getFamilyrelations().equals("7")) {
+ dataMap.put("YJXZGX", "鍙楀鎵樹汉");
}
//淇℃伅鏉ユ簮
- if (serviceDonatebaseinfo.getInfosources().contains("鍖荤枟鏈烘瀯")) {
+ if (infosources.contains("绾㈠崄瀛椾細")) {
+ dataMap.put("HSZH2", (char) 8730); // 鍕鹃�夌鍙�
+ } else {
+ dataMap.put("HSZH2", "鈻�"); // 鏂规绗﹀彿
+ }
+ if (infosources.contains("鍖荤枟鏈烘瀯")) {
dataMap.put("YLJG", (char) 8730);
- if (serviceDonatebaseinfo.getInfosources().contains("瀹跺睘")) {
+ if (infosources.contains("瀹跺睘")) {
dataMap.put("QS", (char) 8730);
- if (serviceDonatebaseinfo.getInfosources().contains("浜ら��")) {
+ if (infosources.contains("浜ら��")) {
dataMap.put("JT", (char) 8730);
- if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+ if (infosources.contains("鍏畨")) {
dataMap.put("GA", (char) 8730);
} else {
dataMap.put("GA", "鈻�");
}
} else {
dataMap.put("JT", "鈻�");
- if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+ if (infosources.contains("鍏畨")) {
dataMap.put("GA", (char) 8730);
} else {
dataMap.put("GA", "鈻�");
@@ -853,16 +919,16 @@
}
} else {
dataMap.put("QS", "鈻�");
- if (serviceDonatebaseinfo.getInfosources().contains("浜ら��")) {
+ if (infosources.contains("浜ら��")) {
dataMap.put("JT", (char) 8730);
- if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+ if (infosources.contains("鍏畨")) {
dataMap.put("GA", (char) 8730);
} else {
dataMap.put("GA", "鈻�");
}
} else {
dataMap.put("JT", "鈻�");
- if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+ if (infosources.contains("鍏畨")) {
dataMap.put("GA", (char) 8730);
} else {
dataMap.put("GA", "鈻�");
@@ -871,18 +937,18 @@
}
} else {
dataMap.put("YLJG", "鈻�");
- if (serviceDonatebaseinfo.getInfosources().contains("瀹跺睘")) {
+ if (infosources.contains("瀹跺睘")) {
dataMap.put("QS", (char) 8730);
- if (serviceDonatebaseinfo.getInfosources().contains("浜ら��")) {
+ if (infosources.contains("浜ら��")) {
dataMap.put("JT", (char) 8730);
- if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+ if (infosources.contains("鍏畨")) {
dataMap.put("GA", (char) 8730);
} else {
dataMap.put("GA", "鈻�");
}
} else {
dataMap.put("JT", "鈻�");
- if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+ if (infosources.contains("鍏畨")) {
dataMap.put("GA", (char) 8730);
} else {
dataMap.put("GA", "鈻�");
@@ -890,16 +956,16 @@
}
} else {
dataMap.put("QS", "鈻�");
- if (serviceDonatebaseinfo.getInfosources().contains("浜ら��")) {
+ if (infosources.contains("浜ら��")) {
dataMap.put("JT", (char) 8730);
- if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+ if (infosources.contains("鍏畨")) {
dataMap.put("GA", (char) 8730);
} else {
dataMap.put("GA", "鈻�");
}
} else {
dataMap.put("JT", "鈻�");
- if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+ if (infosources.contains("鍏畨")) {
dataMap.put("GA", (char) 8730);
} else {
dataMap.put("GA", "鈻�");
@@ -911,21 +977,46 @@
dataMap.put("HSZH", serviceDonatebaseinfo.getRedorganname() == null ? "" : serviceDonatebaseinfo.getRedorganname());
dataMap.put("LXR", serviceDonatebaseinfo.getContactperson() == null ? "" : serviceDonatebaseinfo.getContactperson());
- Date dt1 = serviceDonatebaseinfo.getContacttime();
- String date1 = formatter.format(dt1);
- String time1 = date1.substring(0, 16);
- dataMap.put("LXSJ", serviceDonatebaseinfo.getContacttime() == null ? "" : time1);
+ String lxsj = "";
+ if (serviceDonatebaseinfo.getContacttime() != null) {
+ lxsj = formatter.format(serviceDonatebaseinfo.getContacttime()).substring(0, 16);
+ }
+ dataMap.put("LXSJ", lxsj);
dataMap.put("HQZZ", serviceDonatebaseinfo.getAcquisitiontissuename() == null ? "" : serviceDonatebaseinfo.getAcquisitiontissuename());
dataMap.put("BGR", serviceDonatebaseinfo.getReportername() == null ? "" : serviceDonatebaseinfo.getReportername());
dataMap.put("BGRDH", serviceDonatebaseinfo.getReporterphone() == null ? "" : serviceDonatebaseinfo.getReporterphone());
+
+ //鑾峰彇鎶ュ憡鏃堕棿
+ String bgrq = null;
+ if (serviceDonatebaseinfo.getReporttime() != null) {
+ Date reportTime = serviceDonatebaseinfo.getReporttime();
+ LocalDate localDate = reportTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+
+ int year = localDate.getYear();
+ int month = localDate.getMonthValue(); // 鐩存帴鑾峰彇鏈堜唤鍊硷紙1-12锛�
+ int day = localDate.getDayOfMonth();
+ bgrq = year + "骞�" + month + "鏈�" + day + "鏃�";
+ }
+
+ dataMap.put("BGRQ", bgrq);
}
@ApiOperation("鑾峰彇鐘舵�佽幏鍙栬鏁�")
@GetMapping("/countByRecordState")
public AjaxResult countByRecordState(TimeVO timeVO) {
+ log.info("鑾峰彇鐘舵�佽幏鍙栬鏁帮細{}", timeVO);
return AjaxResult.success(serviceDonatebaseinfoService.countByRecordState(timeVO));
}
+ /**
+ * 鑾峰彇鎹愮尞宸ヤ綔娴�
+ */
+ @ApiOperation("鑾峰彇鎹愮尞宸ヤ綔娴�")
+ @GetMapping(value = "/getWorkFlow/{id}")
+ public AjaxResult getWorkFlow(@PathVariable("id") Long id) {
+ log.info("鑾峰彇鎹愮尞宸ヤ綔娴侊細{}", id);
+ return AjaxResult.success(serviceDonatebaseinfoService.getWorkFlow(id));
+ }
}
--
Gitblit v1.9.3