From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 02 一月 2025 18:44:28 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java |  574 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 309 insertions(+), 265 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
index c20602a..0c05ca2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -8,17 +8,22 @@
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.enums.OrganEnum;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
 import com.ruoyi.project.domain.ServiceDonateorgan;
 import com.ruoyi.project.domain.vo.DonationCompletionVO;
 import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
+import com.ruoyi.project.service.IServiceDonatecomporganService;
 import com.ruoyi.project.service.IServiceDonateorganService;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,20 +34,23 @@
 
 /**
  * 鎹愮尞瀹屾垚Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-11-19
  */
+@Slf4j
 @Api("鎹愮尞瀹屾垚鐧昏绠$悊")
 @RestController
 @RequestMapping("/project/donatecompletioninfo")
-public class ServiceDonatecompletioninfoController extends BaseController
-{
+public class ServiceDonatecompletioninfoController extends BaseController {
     @Autowired
     private IServiceDonatecompletioninfoService serviceDonatecompletioninfoService;
 
     @Autowired
     private IServiceDonateorganService serviceDonateorganService;
+
+    @Autowired
+    private IServiceDonatecomporganService serviceDonatecomporganService;
 
     private static Configuration configuration = null;
 
@@ -55,10 +63,10 @@
      * 鏌ヨ鎹愮尞瀹屾垚鍒楄〃
      */
     @ApiOperation("鏌ヨ鎹愮尞瀹屾垚鍒楄〃")
-    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
+    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ServiceDonatecompletioninfo serviceDonatecompletioninfo)
-    {
+    public TableDataInfo list(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
+        log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛歿}", serviceDonatecompletioninfo);
         startPage();
         List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
         return getDataTable(list);
@@ -67,8 +75,8 @@
     @ApiOperation("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛堟柊锛�")
     @GetMapping("/listnew")
     @Log(title = "鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛堟柊锛�", businessType = BusinessType.OTHER)
-    public TableDataInfo listnew (DonationCompletionVO donationCompletionVO)
-    {
+    public TableDataInfo listnew(DonationCompletionVO donationCompletionVO) {
+        log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛堟柊锛夛細{}", donationCompletionVO);
         startPage();
         List<DonationCompletionVO> list = serviceDonatecompletioninfoService.selectVOList(donationCompletionVO);
         return getDataTable(list);
@@ -79,11 +87,11 @@
      * 瀵煎嚭鎹愮尞瀹屾垚鍒楄〃
      */
     @ApiOperation("瀵煎嚭鎹愮尞瀹屾垚鍒楄〃")
-    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:export')")
+    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:export')")
     @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(ServiceDonatecompletioninfo serviceDonatecompletioninfo)
-    {
+    public AjaxResult export(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
+        log.info("瀵煎嚭鎹愮尞瀹屾垚鍒楄〃锛堟柊锛夛細{}", serviceDonatecompletioninfo);
         List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
         ExcelUtil<ServiceDonatecompletioninfo> util = new ExcelUtil<ServiceDonatecompletioninfo>(ServiceDonatecompletioninfo.class);
         return util.exportExcel(list, "鎹愮尞瀹屾垚鏁版嵁");
@@ -93,10 +101,10 @@
      * 鑾峰彇鎹愮尞瀹屾垚璇︾粏淇℃伅
      */
     @ApiOperation("閫氳繃id鑾峰彇鏌愪竴鏉℃崘鐚畬鎴愪俊鎭�")
-    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:query')")
+    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        log.info("閫氳繃id鑾峰彇鏌愪竴鏉℃崘鐚畬鎴愪俊鎭細{}", id);
         return AjaxResult.success(serviceDonatecompletioninfoService.getById(id));
     }
 
@@ -104,14 +112,60 @@
      * 鏂板鎹愮尞瀹屾垚
      */
     @ApiOperation("鏂板鎹愮尞瀹屾垚")
-    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
+    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
     @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     @RepeatSubmit(interval = 5000)
-    public AjaxResult add(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo)
-    {
-        serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(),serviceDonatecompletioninfo.getCreateBy());
-        return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
+    public AjaxResult add(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
+        log.info("鏂板鎹愮尞瀹屾垚锛歿}", serviceDonatecompletioninfo);
+        serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
+        boolean save = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
+        log.info("鏂板鎹愮尞瀹屾垚serviceDonatecompletioninfo鐨処D锛歿}", serviceDonatecompletioninfo.getId());
+        return AjaxResult.success(serviceDonatecompletioninfo);
+    }
+
+//    /**
+//     * 鏂板鎹愮尞瀹屾垚璇︽儏
+//     */
+//    @ApiOperation("鏂板鎹愮尞瀹屾垚璇︽儏")
+//    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
+//    @Log(title = "鏂板鎹愮尞瀹屾垚璇︽儏", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    @RepeatSubmit(interval = 5000)
+//    public AjaxResult addDetail(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
+//        log.info("鏂板鎹愮尞瀹屾垚锛歿}", serviceDonatecompletioninfo);
+//        serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
+//        //鏂板donatecomporgan鏁版嵁
+//        if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfo.getServiceDonatecomporganList())) {
+//            for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfo.getServiceDonatecomporganList()) {
+//                if (serviceDonatecomporgan.getInfoid() == null) {
+//                    throw new BaseException("璇锋鏌ユ崘鐚櫒瀹樼Щ妞嶄俊鎭紝鏄惁涓庢崘鐚熀纭�琛ㄨ繘琛屽叧鑱�");
+//                }
+//                serviceDonatecomporganService.save(serviceDonatecomporgan);
+//            }
+//        }
+//        return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
+//    }
+
+    @RepeatSubmit
+    @ApiOperation("鏂板鎴栦慨鏀规崘鐚畬鎴�")
+    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
+    @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
+    @PostMapping("/saveOrUpdateDonatecompletioninfo")
+    public AjaxResult saveOrUpdateDonatecompletioninfo(@RequestBody List<ServiceDonatecompletioninfo> serviceDonatecompletioninfoList) {
+        if (CollectionUtils.isEmpty(serviceDonatecompletioninfoList)) {
+            throw new BaseException("璇锋鏌ラ渶瑕佹柊澧炴垨淇敼鐨勬崘鐚畬鎴愬弬鏁版槸鍚﹀畬鏁�");
+        }
+        Boolean i = null;
+        for (ServiceDonatecompletioninfo serviceDonatecompletioninfo : serviceDonatecompletioninfoList) {
+            log.info("鎹愮尞瀹屾垚id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonatecompletioninfo.getId(), serviceDonatecompletioninfo.getInfoid());
+            if (serviceDonatecompletioninfo.getId() == null) {
+                i = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
+            } else {
+                i = serviceDonatecompletioninfoService.updateById(serviceDonatecompletioninfo);
+            }
+        }
+        return toAjax(i);
     }
 
     /**
@@ -119,11 +173,17 @@
      */
     @RepeatSubmit
     @ApiOperation("淇敼鎹愮尞瀹屾垚")
-    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
+    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
     @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo)
-    {
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
+        ServiceDonatecompletioninfo serviceDonatecompletioninfo1 = new ServiceDonatecompletioninfo();
+        serviceDonatecompletioninfo1.setInfoid(serviceDonatecompletioninfo.getInfoid());
+        List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo1);
+        if (CollectionUtils.isEmpty(list)) {
+            return error("妗堜緥ID锛屽搴旂殑瀹屾垚鐧昏淇℃伅涓虹┖");
+        }
+        serviceDonatecompletioninfo.setId(list.get(0).getId());
         return toAjax(serviceDonatecompletioninfoService.updateById(serviceDonatecompletioninfo));
     }
 
@@ -131,11 +191,10 @@
      * 鍒犻櫎鎹愮尞瀹屾垚
      */
     @ApiOperation("鍒犻櫎鎹愮尞瀹屾垚")
-    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:remove')")
+    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:remove')")
     @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(serviceDonatecompletioninfoService.removeByIds(Arrays.asList(ids)));
     }
 
@@ -151,7 +210,7 @@
         System.out.println(filePath);
         //璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
         configuration.setDirectoryForTemplateLoading(new File(filePath));
-        Template t=null;
+        Template t = null;
         try {
             //鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
             t = configuration.getTemplate("浜轰綋鍣ㄥ畼鎹愮尞瀹屾垚缁撴灉鐧昏琛�.ftl");
@@ -159,13 +218,13 @@
             e.printStackTrace();
         }
         String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
-        String name = "浜轰綋鍣ㄥ畼鎹愮尞瀹屾垚缁撴灉鐧昏琛╛"+dataMap.get("XM")+"_"+ newTime;
+        String name = "浜轰綋鍣ㄥ畼鎹愮尞瀹屾垚缁撴灉鐧昏琛╛" + dataMap.get("XM") + "_" + newTime;
         //杈撳嚭鏂囨。璺緞鍙婂悕绉�
-        File outFile = new File(RuoYiConfig.getProfile()+"/download/wordtemplate/"+name+".doc");
+        File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
         Writer out = null;
 
         try {
-            out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile),"utf-8"));
+            out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
 
         } catch (FileNotFoundException e1) {
             e1.printStackTrace();
@@ -175,73 +234,76 @@
         } catch (TemplateException e) {
             e.printStackTrace();
         }
-        Map<String ,Object> map = new HashMap<>();
-        map.put("downloadUrl","/profile/download/wordtemplate/"+name+".doc");
+        Map<String, Object> map = new HashMap<>();
+        map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+        map.put("downloadName", name + ".doc");
         return map;
     }
+
     /**
      * 娉ㄦ剰dataMap閲屽瓨鏀剧殑鏁版嵁Key鍊艰涓庢ā鏉夸腑鐨勫弬鏁扮浉瀵瑰簲
+     *
      * @param dataMap
      */
-    private void getData(Map dataMap, Long id){
+    private void getData(Map dataMap, Long id) {
         DonationCompletionVO donationCompletionVO = new DonationCompletionVO();
         //donationCompletionVO.setDonorno(serviceDonatecompletioninfo.getDonorno());
         List<DonationCompletionVO> list = serviceDonatecompletioninfoService.selectVOList(donationCompletionVO);
         DonationCompletionVO donationCompletion = new DonationCompletionVO();
-        for(DonationCompletionVO v : list){
-            if(v.getDcid() != null && v.getDcid().longValue() == id){
+        for (DonationCompletionVO v : list) {
+            if (v.getDcid() != null && v.getDcid().longValue() == id) {
                 donationCompletion = v;
             }
         }
 
 
-        dataMap.put("JXBH",donationCompletion.getDcdonorno());
-        dataMap.put("XM",donationCompletion.getName());
-        dataMap.put("HQZZ",donationCompletion.getTreatmenthospitalname() == null ? "" : donationCompletion.getTreatmenthospitalname());
-        if(donationCompletion.getDonateorgan().contains("C22")){
-            dataMap.put("GZ",(char) 8730);
-        }else{
-            dataMap.put("GZ","鈻�");
+        dataMap.put("JXBH", donationCompletion.getDcdonorno());
+        dataMap.put("XM", donationCompletion.getName());
+        dataMap.put("HQZZ", donationCompletion.getTreatmenthospitalname() == null ? "" : donationCompletion.getTreatmenthospitalname());
+        if (donationCompletion.getDonateorgan().contains("C22")) {
+            dataMap.put("GZ", (char) 8730);
+        } else {
+            dataMap.put("GZ", "鈻�");
         }
-        if(donationCompletion.getDonateorgan().contains("C64L")){
-            dataMap.put("ZS",(char) 8730);
-        }else{
-            dataMap.put("ZS","鈻�");
+        if (donationCompletion.getDonateorgan().contains("C64L")) {
+            dataMap.put("ZS", (char) 8730);
+        } else {
+            dataMap.put("ZS", "鈻�");
         }
-        if(donationCompletion.getDonateorgan().contains("C64R")){
-            dataMap.put("YS",(char) 8730);
-        }else{
-            dataMap.put("YS","鈻�");
+        if (donationCompletion.getDonateorgan().contains("C64R")) {
+            dataMap.put("YS", (char) 8730);
+        } else {
+            dataMap.put("YS", "鈻�");
         }
-        if(donationCompletion.getDonateorgan().contains("C38")){
-            dataMap.put("XZ",(char) 8730);
-        }else{
-            dataMap.put("XZ","鈻�");
+        if (donationCompletion.getDonateorgan().contains("C38")) {
+            dataMap.put("XZ", (char) 8730);
+        } else {
+            dataMap.put("XZ", "鈻�");
         }
-        if(donationCompletion.getDonateorgan().contains("C34")){
-            dataMap.put("FZ",(char) 8730);
-        }else{
-            dataMap.put("FZ","鈻�");
+        if (donationCompletion.getDonateorgan().contains("C34")) {
+            dataMap.put("FZ", (char) 8730);
+        } else {
+            dataMap.put("FZ", "鈻�");
         }
-        if(donationCompletion.getDonateorgan().contains("C25")){
-            dataMap.put("YX",(char) 8730);
-        }else{
-            dataMap.put("YX","鈻�");
+        if (donationCompletion.getDonateorgan().contains("C25")) {
+            dataMap.put("YX", (char) 8730);
+        } else {
+            dataMap.put("YX", "鈻�");
         }
-        if(donationCompletion.getDonateorgan().contains("C17")){
-            dataMap.put("XC",(char) 8730);
-        }else{
-            dataMap.put("XC","鈻�");
+        if (donationCompletion.getDonateorgan().contains("C17")) {
+            dataMap.put("XC", (char) 8730);
+        } else {
+            dataMap.put("XC", "鈻�");
         }
-        if(donationCompletion.getDonateorgan().contains("C69L")){
-            dataMap.put("ZYZZ",(char) 8730);
-        }else{
-            dataMap.put("ZYZZ","鈻�");
+        if (donationCompletion.getDonateorgan().contains("C69L")) {
+            dataMap.put("ZYZZ", (char) 8730);
+        } else {
+            dataMap.put("ZYZZ", "鈻�");
         }
-        if(donationCompletion.getDonateorgan().contains("C69R")){
-            dataMap.put("YYZZ",(char) 8730);
-        }else{
-            dataMap.put("YYZZ","鈻�");
+        if (donationCompletion.getDonateorgan().contains("C69R")) {
+            dataMap.put("YYZZ", (char) 8730);
+        } else {
+            dataMap.put("YYZZ", "鈻�");
         }
         ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
         serviceDonateorgan.setInfoid(donationCompletion.getInfoid());
@@ -264,209 +326,191 @@
 
         SimpleDateFormat sformat = new SimpleDateFormat("yyyy-MM-dd");
 
-        if(donateorganList.size() > 0){
-            for(int i = 0; i<donateorganList.size(); i++){
-               if(donateorganList.get(i).getOrganno().equals(OrganEnum.XZ.getCode())){
-                   dataMap.put("XZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
-                   dataMap.put("XZFZR",donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
-                   if(donateorganList.get(i).getOrganstate().equals("99")){
-                       dataMap.put("XZRQ", "寮冪敤");
-                   }
-                   else {
-                       dataMap.put("XZRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
-                   }
-                   xz = true;
-               }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.QG.getCode())){
-                   dataMap.put("GZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
-                   dataMap.put("GZFZR",donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
-                   if(donateorganList.get(i).getOrganstate().equals("99")){
-                       dataMap.put("GZRQ", "寮冪敤");
-                   }
-                   else {
-                       dataMap.put("GZRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
-                   }
+        if (donateorganList.size() > 0) {
+            for (int i = 0; i < donateorganList.size(); i++) {
+                if (donateorganList.get(i).getOrganno().equals(OrganEnum.XZ.getCode())) {
+                    dataMap.put("XZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+                    dataMap.put("XZFZR", donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
+                    if (donateorganList.get(i).getOrganstate().equals("99")) {
+                        dataMap.put("XZRQ", "寮冪敤");
+                    } else {
+                        dataMap.put("XZRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
+                    }
+                    xz = true;
+                } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.QG.getCode())) {
+                    dataMap.put("GZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+                    dataMap.put("GZFZR", donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
+                    if (donateorganList.get(i).getOrganstate().equals("99")) {
+                        dataMap.put("GZRQ", "寮冪敤");
+                    } else {
+                        dataMap.put("GZRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
+                    }
                     qg = true;
-               }
-               else if(donateorganList.get(i).getOrganno().equals(OrganEnum.ZG.getCode())){
-                   dataMap.put("ZGZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
-                   dataMap.put("ZGZFZR",donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
-                   if(donateorganList.get(i).getOrganstate().equals("99")){
-                       dataMap.put("ZGZRQ", "寮冪敤");
-                   }
-                   else {
-                       dataMap.put("ZGZRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
-                   }
-                   zg = true;
-               }
-               else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YG.getCode())){
-                   dataMap.put("YGZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
-                   dataMap.put("YGZFZR",donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
-                   if(donateorganList.get(i).getOrganstate().equals("99")){
-                       dataMap.put("YGZRQ", "寮冪敤");
-                   }
-                   else {
-                       dataMap.put("YGZRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
-                   }
-                   yg = true;
-               }
-               else if(donateorganList.get(i).getOrganno().equals(OrganEnum.ZS.getCode())){
-                   dataMap.put("ZSYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
-                   dataMap.put("ZSFZR",donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
-                   if(donateorganList.get(i).getOrganstate().equals("99")){
-                       dataMap.put("ZSRQ", "寮冪敤");
-                   }
-                   else {
-                       dataMap.put("ZSRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
-                   }
-                   zs = true;
-               }
-               else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YS.getCode())){
-                   dataMap.put("YSYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
-                   dataMap.put("YSFZR",donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
-                   if(donateorganList.get(i).getOrganstate().equals("99")){
-                       dataMap.put("YSRQ", "寮冪敤");
-                   }
-                   else {
-                       dataMap.put("YSRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
-                   }
-                   ys = true;
-               }
-               else if(donateorganList.get(i).getOrganno().equals(OrganEnum.ZF.getCode())){
-                   dataMap.put("ZFYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
-                   dataMap.put("ZFFZR",donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
-                   if(donateorganList.get(i).getOrganstate().equals("99")){
-                       dataMap.put("ZFRQ", "寮冪敤");
-                   }
-                   else {
-                       dataMap.put("ZFRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
-                   }
-                   zf = true;
-               }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YF.getCode())){
-                   dataMap.put("YFYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
-                   dataMap.put("YFFZR",donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
-                   if(donateorganList.get(i).getOrganstate().equals("99")){
-                       dataMap.put("YFRQ", "寮冪敤");
-                   }
-                   else {
-                       dataMap.put("YFRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
-                   }
-                   yf = true;
-               }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.QF.getCode())){
-                   dataMap.put("FZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
-                   dataMap.put("FZFZR",donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
-                   if(donateorganList.get(i).getOrganstate().equals("99")){
-                       dataMap.put("FZRQ", "寮冪敤");
-                   }
-                   else {
-                       dataMap.put("FZRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
-                   }
-                   qf = true;
-               } else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YX.getCode())){
-                   dataMap.put("YXYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
-                   dataMap.put("YXFZR",donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
-                   if(donateorganList.get(i).getOrganstate().equals("99")){
-                       dataMap.put("YXRQ", "寮冪敤");
-                   }
-                   else {
-                       dataMap.put("YXRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
-                   }
-                   yx = true;
-               }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.XC.getCode())){
-                   dataMap.put("XCYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
-                   dataMap.put("XCYY",donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
-                   if(donateorganList.get(i).getOrganstate().equals("99")){
-                       dataMap.put("XCYY", "寮冪敤");
-                   }
-                   else {
-                       dataMap.put("XCYY", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
-                   }
-                   xc = true;
-               }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.ZYJM.getCode())){
-                   dataMap.put("ZYYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
-                   dataMap.put("ZYFZR",donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
-                   if(donateorganList.get(i).getOrganstate().equals("99")){
-                       dataMap.put("ZYRQ", "寮冪敤");
-                   }
-                   else {
-                       dataMap.put("ZYRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
-                   }
-                   zyjm = true;
-               }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YYJM.getCode())){
-                   dataMap.put("YYYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
-                   dataMap.put("YYFZR",donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
-                   if(donateorganList.get(i).getOrganstate().equals("99")){
-                       dataMap.put("YYRQ", "寮冪敤");
-                   }
-                   else {
-                       dataMap.put("YYRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
-                   }
-                   yyjm = true;
-               }
+                } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.ZG.getCode())) {
+                    dataMap.put("ZGZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+                    dataMap.put("ZGZFZR", donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
+                    if (donateorganList.get(i).getOrganstate().equals("99")) {
+                        dataMap.put("ZGZRQ", "寮冪敤");
+                    } else {
+                        dataMap.put("ZGZRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
+                    }
+                    zg = true;
+                } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YG.getCode())) {
+                    dataMap.put("YGZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+                    dataMap.put("YGZFZR", donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
+                    if (donateorganList.get(i).getOrganstate().equals("99")) {
+                        dataMap.put("YGZRQ", "寮冪敤");
+                    } else {
+                        dataMap.put("YGZRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
+                    }
+                    yg = true;
+                } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.ZS.getCode())) {
+                    dataMap.put("ZSYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+                    dataMap.put("ZSFZR", donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
+                    if (donateorganList.get(i).getOrganstate().equals("99")) {
+                        dataMap.put("ZSRQ", "寮冪敤");
+                    } else {
+                        dataMap.put("ZSRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
+                    }
+                    zs = true;
+                } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YS.getCode())) {
+                    dataMap.put("YSYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+                    dataMap.put("YSFZR", donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
+                    if (donateorganList.get(i).getOrganstate().equals("99")) {
+                        dataMap.put("YSRQ", "寮冪敤");
+                    } else {
+                        dataMap.put("YSRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
+                    }
+                    ys = true;
+                } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.ZF.getCode())) {
+                    dataMap.put("ZFYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+                    dataMap.put("ZFFZR", donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
+                    if (donateorganList.get(i).getOrganstate().equals("99")) {
+                        dataMap.put("ZFRQ", "寮冪敤");
+                    } else {
+                        dataMap.put("ZFRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
+                    }
+                    zf = true;
+                } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YF.getCode())) {
+                    dataMap.put("YFYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+                    dataMap.put("YFFZR", donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
+                    if (donateorganList.get(i).getOrganstate().equals("99")) {
+                        dataMap.put("YFRQ", "寮冪敤");
+                    } else {
+                        dataMap.put("YFRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
+                    }
+                    yf = true;
+                } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.QF.getCode())) {
+                    dataMap.put("FZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+                    dataMap.put("FZFZR", donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
+                    if (donateorganList.get(i).getOrganstate().equals("99")) {
+                        dataMap.put("FZRQ", "寮冪敤");
+                    } else {
+                        dataMap.put("FZRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
+                    }
+                    qf = true;
+                } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YX.getCode())) {
+                    dataMap.put("YXYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+                    dataMap.put("YXFZR", donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
+                    if (donateorganList.get(i).getOrganstate().equals("99")) {
+                        dataMap.put("YXRQ", "寮冪敤");
+                    } else {
+                        dataMap.put("YXRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
+                    }
+                    yx = true;
+                } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.XC.getCode())) {
+                    dataMap.put("XCYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+                    dataMap.put("XCYY", donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
+                    if (donateorganList.get(i).getOrganstate().equals("99")) {
+                        dataMap.put("XCYY", "寮冪敤");
+                    } else {
+                        dataMap.put("XCYY", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
+                    }
+                    xc = true;
+                } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.ZYJM.getCode())) {
+                    dataMap.put("ZYYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+                    dataMap.put("ZYFZR", donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
+                    if (donateorganList.get(i).getOrganstate().equals("99")) {
+                        dataMap.put("ZYRQ", "寮冪敤");
+                    } else {
+                        dataMap.put("ZYRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
+                    }
+                    zyjm = true;
+                } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YYJM.getCode())) {
+                    dataMap.put("YYYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+                    dataMap.put("YYFZR", donateorganList.get(i).getTransplantdoct() == null ? "" : donateorganList.get(i).getTransplantdoct());
+                    if (donateorganList.get(i).getOrganstate().equals("99")) {
+                        dataMap.put("YYRQ", "寮冪敤");
+                    } else {
+                        dataMap.put("YYRQ", donateorganList.get(i).getTransplanttime() == null ? "" : sformat.format(donateorganList.get(i).getTransplanttime()));
+                    }
+                    yyjm = true;
+                }
             }
-            if(xz.booleanValue() == false){
-                dataMap.put("XZYY","");
-                dataMap.put("XZFZR","");
-                dataMap.put("XZRQ","");
+            if (xz.booleanValue() == false) {
+                dataMap.put("XZYY", "");
+                dataMap.put("XZFZR", "");
+                dataMap.put("XZRQ", "");
             }
-            if(qg.booleanValue() == false){
-                dataMap.put("GZYY","");
-                dataMap.put("GZFZR","");
-                dataMap.put("GZRQ","");
+            if (qg.booleanValue() == false) {
+                dataMap.put("GZYY", "");
+                dataMap.put("GZFZR", "");
+                dataMap.put("GZRQ", "");
             }
-            if(zg.booleanValue() == false){
-                dataMap.put("ZGYY","");
-                dataMap.put("ZGFZR","");
-                dataMap.put("ZGRQ","");
+            if (zg.booleanValue() == false) {
+                dataMap.put("ZGYY", "");
+                dataMap.put("ZGFZR", "");
+                dataMap.put("ZGRQ", "");
             }
-            if(yg.booleanValue() == false){
-                dataMap.put("YGYY","");
-                dataMap.put("YGFZR","");
-                dataMap.put("YGRQ","");
+            if (yg.booleanValue() == false) {
+                dataMap.put("YGYY", "");
+                dataMap.put("YGFZR", "");
+                dataMap.put("YGRQ", "");
             }
-            if(zs.booleanValue() == false){
-                dataMap.put("ZSYY","");
-                dataMap.put("ZSFZR","");
-                dataMap.put("ZSRQ","");
+            if (zs.booleanValue() == false) {
+                dataMap.put("ZSYY", "");
+                dataMap.put("ZSFZR", "");
+                dataMap.put("ZSRQ", "");
             }
-            if(ys.booleanValue() == false){
-                dataMap.put("YSYY","");
-                dataMap.put("YSFZR","");
-                dataMap.put("YSRQ","");
+            if (ys.booleanValue() == false) {
+                dataMap.put("YSYY", "");
+                dataMap.put("YSFZR", "");
+                dataMap.put("YSRQ", "");
             }
-            if(zf.booleanValue() == false){
-                dataMap.put("ZFYY","");
-                dataMap.put("ZFFZR","");
-                dataMap.put("ZFRQ","");
+            if (zf.booleanValue() == false) {
+                dataMap.put("ZFYY", "");
+                dataMap.put("ZFFZR", "");
+                dataMap.put("ZFRQ", "");
             }
-            if(yf.booleanValue() == false){
-                dataMap.put("YFYY","");
-                dataMap.put("YFFZR","");
-                dataMap.put("YFRQ","");
+            if (yf.booleanValue() == false) {
+                dataMap.put("YFYY", "");
+                dataMap.put("YFFZR", "");
+                dataMap.put("YFRQ", "");
             }
-            if(qf.booleanValue() == false){
-                dataMap.put("FZYY","");
-                dataMap.put("FZFZR","");
-                dataMap.put("FZRQ","");
+            if (qf.booleanValue() == false) {
+                dataMap.put("FZYY", "");
+                dataMap.put("FZFZR", "");
+                dataMap.put("FZRQ", "");
             }
-            if(yx.booleanValue() == false){
-                dataMap.put("YXYY","");
-                dataMap.put("YXFZR","");
-                dataMap.put("YXRQ","");
+            if (yx.booleanValue() == false) {
+                dataMap.put("YXYY", "");
+                dataMap.put("YXFZR", "");
+                dataMap.put("YXRQ", "");
             }
-            if(xc.booleanValue() == false){
-                dataMap.put("XCYY","");
-                dataMap.put("XCFZR","");
-                dataMap.put("XCRQ","");
+            if (xc.booleanValue() == false) {
+                dataMap.put("XCYY", "");
+                dataMap.put("XCFZR", "");
+                dataMap.put("XCRQ", "");
             }
-            if(zyjm.booleanValue() == false){
-                dataMap.put("ZYYY","");
-                dataMap.put("ZYFZR","");
-                dataMap.put("ZYRQ","");
+            if (zyjm.booleanValue() == false) {
+                dataMap.put("ZYYY", "");
+                dataMap.put("ZYFZR", "");
+                dataMap.put("ZYRQ", "");
             }
-            if(yyjm.booleanValue() == false){
-                dataMap.put("YYYY","");
-                dataMap.put("YYFZR","");
-                dataMap.put("YYRQ","");
+            if (yyjm.booleanValue() == false) {
+                dataMap.put("YYYY", "");
+                dataMap.put("YYFZR", "");
+                dataMap.put("YYRQ", "");
             }
         }
 

--
Gitblit v1.9.3