From e376946a110815d42d09f555300e7521eae66cb1 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 27 七月 2023 17:56:49 +0800
Subject: [PATCH] 放开deptid

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 1166 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 576 insertions(+), 590 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 6091070..cfb81c0 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
@@ -35,15 +35,14 @@
 
 /**
  * 鎹愮尞鍩虹Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-11-10
  */
 @Api("娼滃湪鎹愮尞淇℃伅绠$悊")
 @RestController
 @RequestMapping("/project/donatebaseinfo")
-public class ServiceDonatebaseinfoController extends BaseController
-{
+public class ServiceDonatebaseinfoController extends BaseController {
     @Autowired
     private IServiceDonatebaseinfoService serviceDonatebaseinfoService;
 
@@ -70,8 +69,7 @@
     @ApiOperation("娼滃湪鎹愮尞淇℃伅鍒楄〃")
     //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo)
-    {
+    public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
         startPage();
         //List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
         List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
@@ -80,8 +78,7 @@
 
     @ApiOperation("灏忕▼搴忕娼滃湪鎹愮尞淇℃伅鍒楄〃")
     @GetMapping("/listForSearch")
-    public TableDataInfo listForSearch(ServiceDonatebaseinfo serviceDonatebaseinfo)
-    {
+    public TableDataInfo listForSearch(ServiceDonatebaseinfo serviceDonatebaseinfo) {
         startPage();
         List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.listForSearch(serviceDonatebaseinfo);
         return getDataTable(list);
@@ -95,8 +92,7 @@
     //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:export')")
     @Log(title = "鎹愮尞鍩虹", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(ServiceDonatebaseinfo serviceDonatebaseinfo)
-    {
+    public AjaxResult export(ServiceDonatebaseinfo serviceDonatebaseinfo) {
         List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
         ExcelUtil<ServiceDonatebaseinfo> util = new ExcelUtil<ServiceDonatebaseinfo>(ServiceDonatebaseinfo.class);
         return util.exportExcel(list, "鎹愮尞鍩虹鏁版嵁");
@@ -108,8 +104,7 @@
     @ApiOperation("閫氳繃id鑾峰緱娼滃湪鎹愮尞淇℃伅")
     //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(serviceDonatebaseinfoService.getById(id));
     }
 
@@ -121,24 +116,19 @@
     @Log(title = "鎹愮尞鍩虹", businessType = BusinessType.INSERT)
     @PostMapping
     @RepeatSubmit
-    public AjaxResult add(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo)
-    {
+    public AjaxResult add(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
 
-        String bh= "";
+        String bh = "";
         bh = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
-        if (bh == "")
-        {
+        if (bh == "") {
             return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿涓虹┖,鍒涘缓澶辫触!");
-        }
-        else
-        {
+        } else {
             ServiceDonatebaseinfo serviceDonatebaseinfo1 = new ServiceDonatebaseinfo();
             serviceDonatebaseinfo1.setDonorno(bh);
             List<ServiceDonatebaseinfo> listrecord = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo1);
-            if (listrecord.size()>0)
-            {
-                return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿"+bh+"宸插瓨鍦�,鏃犳硶淇濆瓨!");
+            if (listrecord.size() > 0) {
+                return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿" + bh + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
             }
 
         }
@@ -146,15 +136,14 @@
         ServiceDonatebaseinfo serviceDonatebaseinfo2 = new ServiceDonatebaseinfo();
         serviceDonatebaseinfo2.setIdcardno(idcardno);
         List<ServiceDonatebaseinfo> listrecord2 = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo2);
-        if (listrecord2.size()>0)
-        {
-            return AjaxResult.error("鏂板鏃惰韩浠借瘉"+idcardno+"宸插瓨鍦�,鏃犳硶淇濆瓨!");
+        if (listrecord2.size() > 0) {
+            return AjaxResult.error("鏂板鏃惰韩浠借瘉" + idcardno + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
         }
 
 
         serviceDonatebaseinfo.setDonorno(bh);
-        //serviceDonatebaseinfo.setDeptid(user.getDeptId());
-        //serviceDonatebaseinfo.setDeptname(sysDeptMapper.getDeptNameByDeptId(user.getDeptId()));
+        serviceDonatebaseinfo.setDeptid(user.getDeptId());
+        serviceDonatebaseinfo.setDeptname(sysDeptMapper.getDeptNameByDeptId(user.getDeptId()));
 
         return toAjax(serviceDonatebaseinfoService.save(serviceDonatebaseinfo));
     }
@@ -166,9 +155,8 @@
     //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
     @Log(title = "鎹愮尞鍩虹", businessType = BusinessType.UPDATE)
     @PutMapping
-    @RepeatSubmit    
-    public AjaxResult edit(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo)
-    {
+    @RepeatSubmit
+    public AjaxResult edit(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
         return toAjax(serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo));
     }
 
@@ -179,26 +167,25 @@
     //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
     @Log(title = "鎹愮尞鍩虹", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(serviceDonatebaseinfoService.removeByIds(Arrays.asList(ids)));
     }
 
     @ApiOperation("鑾峰彇鎹愮尞缂栧彿")
     @GetMapping("/donatenumber")
-    public AjaxResult getDonateNumber(ServiceDonatebaseinfo serviceDonatebaseinfo){
+    public AjaxResult getDonateNumber(ServiceDonatebaseinfo serviceDonatebaseinfo) {
         return AjaxResult.success(serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo));
     }
 
 
     @ApiOperation("鑾峰彇鎹愮尞鎶ュ憡浜�")
     @GetMapping("/reportName/{usertype}")
-    public AjaxResult getReportName(@PathVariable("usertype") String usertype){
+    public AjaxResult getReportName(@PathVariable("usertype") String usertype) {
         return AjaxResult.success(serviceExternalpersonService.getReportName(usertype));
     }
 
     @GetMapping(value = "/updateS1S2S3S4/{id}")
-    public AjaxResult updateS1S2S3S4(@PathVariable Long id){
+    public AjaxResult updateS1S2S3S4(@PathVariable Long id) {
         return AjaxResult.success(serviceDonatebaseinfoService.updateS1S2S3S4(id));
     }
 
@@ -209,13 +196,13 @@
     @GetMapping(value = "/download/{id}")
     public Map downloadInfo(@PathVariable("id") Long id) throws IOException {
         Map dataMap = new HashMap();
-        getData(dataMap,id);
+        getData(dataMap, id);
         String filePath = getClass().getResource("/template/").getPath();
         System.out.println(filePath);
         //璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
         configuration.setDirectoryForTemplateLoading(new File(filePath));
 
-        Template t=null;
+        Template t = null;
         try {
             //鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
             t = configuration.getTemplate("浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃.ftl");
@@ -223,14 +210,14 @@
             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();
@@ -240,704 +227,703 @@
         } 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");
         return map;
     }
 
     /**
      * 娉ㄦ剰dataMap閲屽瓨鏀剧殑鏁版嵁Key鍊艰涓庢ā鏉夸腑鐨勫弬鏁扮浉瀵瑰簲
+     *
      * @param dataMap
      */
-    private void getData(Map dataMap,Long id)
-    {
+    private void getData(Map dataMap, Long id) {
         ServiceDonatebaseinfo serviceDonatebaseinfo = serviceDonatebaseinfoService.getById(id);
-        if(serviceDonatebaseinfo == null){
+        if (serviceDonatebaseinfo == null) {
             throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT);
         }
 
-        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")){
-            dataMap.put("XB","鏈煡鐨勬�у埆");
-        }else if(serviceDonatebaseinfo.getSex().equals("1")){
-            dataMap.put("XB","鐢�");
-        }else if(serviceDonatebaseinfo.getSex().equals("2")){
-            dataMap.put("XB","濂�");
+        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")) {
+            dataMap.put("XB", "鏈煡鐨勬�у埆");
+        } else if (serviceDonatebaseinfo.getSex().equals("1")) {
+            dataMap.put("XB", "鐢�");
+        } else if (serviceDonatebaseinfo.getSex().equals("2")) {
+            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);
-        dataMap.put("GJ",serviceDonatebaseinfo.getNationality() == null ? "" : serviceDonatebaseinfo.getNationality());
-        if(serviceDonatebaseinfo.getIdcardtype() == 1) {
-            dataMap.put("ZJLX","韬唤璇�");
-        }else if(serviceDonatebaseinfo.getIdcardtype() == 2){
-            dataMap.put("ZJLX","鍐涗汉璇�");
-        }else if(serviceDonatebaseinfo.getIdcardtype() == 3){
-            dataMap.put("ZJLX","鎶ょ収");
-        }else if(serviceDonatebaseinfo.getIdcardtype() == 4){
-            dataMap.put("ZJLX","鎴峰彛鏈�");
-        }else if(serviceDonatebaseinfo.getIdcardtype() == 5){
-            dataMap.put("ZJLX","澶栧浗浜烘案涔呭眳浣忚瘉");
-        }else if(serviceDonatebaseinfo.getIdcardtype() == 6){
-            dataMap.put("ZJLX","姝﹁璇�");
-        }else if(serviceDonatebaseinfo.getIdcardtype() == 10){
-            dataMap.put("ZJLX","瀛︾敓璇�");
-        }else if(serviceDonatebaseinfo.getIdcardtype() == 11){
-            dataMap.put("ZJLX","澹叺璇�");
-        }else if(serviceDonatebaseinfo.getIdcardtype() == 16){
-            dataMap.put("ZJLX","娓境灞呮皯鏉ュ線鍐呭湴閫氳璇�");
-        }else if(serviceDonatebaseinfo.getIdcardtype() == 17){
-            dataMap.put("ZJLX","鍙版咕灞呮皯鏉ュ線澶ч檰閫氳璇�");
-        }else if(serviceDonatebaseinfo.getIdcardtype() == 18){
-            dataMap.put("ZJLX","鍏朵粬璇佷欢绫诲瀷");
+        dataMap.put("CSRQ", serviceDonatebaseinfo.getBirthday() == null ? "" : time);
+        dataMap.put("GJ", serviceDonatebaseinfo.getNationality() == null ? "" : serviceDonatebaseinfo.getNationality());
+        if (serviceDonatebaseinfo.getIdcardtype() == 1) {
+            dataMap.put("ZJLX", "韬唤璇�");
+        } else if (serviceDonatebaseinfo.getIdcardtype() == 2) {
+            dataMap.put("ZJLX", "鍐涗汉璇�");
+        } else if (serviceDonatebaseinfo.getIdcardtype() == 3) {
+            dataMap.put("ZJLX", "鎶ょ収");
+        } else if (serviceDonatebaseinfo.getIdcardtype() == 4) {
+            dataMap.put("ZJLX", "鎴峰彛鏈�");
+        } else if (serviceDonatebaseinfo.getIdcardtype() == 5) {
+            dataMap.put("ZJLX", "澶栧浗浜烘案涔呭眳浣忚瘉");
+        } else if (serviceDonatebaseinfo.getIdcardtype() == 6) {
+            dataMap.put("ZJLX", "姝﹁璇�");
+        } else if (serviceDonatebaseinfo.getIdcardtype() == 10) {
+            dataMap.put("ZJLX", "瀛︾敓璇�");
+        } else if (serviceDonatebaseinfo.getIdcardtype() == 11) {
+            dataMap.put("ZJLX", "澹叺璇�");
+        } else if (serviceDonatebaseinfo.getIdcardtype() == 16) {
+            dataMap.put("ZJLX", "娓境灞呮皯鏉ュ線鍐呭湴閫氳璇�");
+        } else if (serviceDonatebaseinfo.getIdcardtype() == 17) {
+            dataMap.put("ZJLX", "鍙版咕灞呮皯鏉ュ線澶ч檰閫氳璇�");
+        } else if (serviceDonatebaseinfo.getIdcardtype() == 18) {
+            dataMap.put("ZJLX", "鍏朵粬璇佷欢绫诲瀷");
         }
-        dataMap.put("ZJHM",serviceDonatebaseinfo.getIdcardno() == null ? "" : serviceDonatebaseinfo.getIdcardno());
+        dataMap.put("ZJHM", serviceDonatebaseinfo.getIdcardno() == null ? "" : serviceDonatebaseinfo.getIdcardno());
         //鎴风睄鍦板潃
-        dataMap.put("ZZSHENG",serviceDonatebaseinfo.getRegisterprovincename() == null ? "" : serviceDonatebaseinfo.getRegisterprovincename());
-        dataMap.put("ZZSHI",serviceDonatebaseinfo.getRegistercityname() == null ? "" : serviceDonatebaseinfo.getRegistercityname());
-        dataMap.put("ZZXIAN",serviceDonatebaseinfo.getRegistertownname() == null ? "" : serviceDonatebaseinfo.getRegistertownname());
-        dataMap.put("ZZXX",serviceDonatebaseinfo.getRegisteraddress() == null ? "" : serviceDonatebaseinfo.getRegisteraddress());
+        dataMap.put("ZZSHENG", serviceDonatebaseinfo.getRegisterprovincename() == null ? "" : serviceDonatebaseinfo.getRegisterprovincename());
+        dataMap.put("ZZSHI", serviceDonatebaseinfo.getRegistercityname() == null ? "" : serviceDonatebaseinfo.getRegistercityname());
+        dataMap.put("ZZXIAN", serviceDonatebaseinfo.getRegistertownname() == null ? "" : serviceDonatebaseinfo.getRegistertownname());
+        dataMap.put("ZZXX", serviceDonatebaseinfo.getRegisteraddress() == null ? "" : serviceDonatebaseinfo.getRegisteraddress());
         //鐜板眳浣忓湴
-        dataMap.put("SZDS",serviceDonatebaseinfo.getResidenceprovincename() == null ? "" : serviceDonatebaseinfo.getResidenceprovincename());
-        dataMap.put("SZDSHI",serviceDonatebaseinfo.getResidencecityname() == null ? "" : serviceDonatebaseinfo.getResidencecityname());
-        dataMap.put("SZDX",serviceDonatebaseinfo.getResidencetownname() == null ? "" : serviceDonatebaseinfo.getResidencetownname());
-        dataMap.put("SZDXX",serviceDonatebaseinfo.getResidenceaddress() == null ? "" : serviceDonatebaseinfo.getResidenceaddress());
+        dataMap.put("SZDS", serviceDonatebaseinfo.getResidenceprovincename() == null ? "" : serviceDonatebaseinfo.getResidenceprovincename());
+        dataMap.put("SZDSHI", serviceDonatebaseinfo.getResidencecityname() == null ? "" : serviceDonatebaseinfo.getResidencecityname());
+        dataMap.put("SZDX", serviceDonatebaseinfo.getResidencetownname() == null ? "" : serviceDonatebaseinfo.getResidencetownname());
+        dataMap.put("SZDXX", serviceDonatebaseinfo.getResidenceaddress() == null ? "" : serviceDonatebaseinfo.getResidenceaddress());
 
-        dataMap.put("ZYH", serviceDonatebaseinfo.getInpatientno() == null ? "" : serviceDonatebaseinfo.getInpatientno() );
+        dataMap.put("ZYH", serviceDonatebaseinfo.getInpatientno() == null ? "" : serviceDonatebaseinfo.getInpatientno());
 
-        if(serviceDonatebaseinfo.getBloodtype().equals("1")){
-            dataMap.put("XXA",(char)8730);
-            dataMap.put("XXB","鈻�");
-            dataMap.put("XXO","鈻�");
-            dataMap.put("XXAB","鈻�");
-        }else if(serviceDonatebaseinfo.getBloodtype().equals("2")){
-            dataMap.put("XXA","鈻�");
-            dataMap.put("XXB",(char)8730);
-            dataMap.put("XXO","鈻�");
-            dataMap.put("XXAB","鈻�");
-        }else if(serviceDonatebaseinfo.getBloodtype().equals("3")){
-            dataMap.put("XXA","鈻�");
-            dataMap.put("XXB","鈻�");
-            dataMap.put("XXO",(char)8730);
-            dataMap.put("XXAB","鈻�");
-        }else if(serviceDonatebaseinfo.getBloodtype().equals("4")){
-            dataMap.put("XXA","鈻�");
-            dataMap.put("XXB","鈻�");
-            dataMap.put("XXO","鈻�");
-            dataMap.put("XXAB",(char)8730);
+        if (serviceDonatebaseinfo.getBloodtype().equals("1")) {
+            dataMap.put("XXA", (char) 8730);
+            dataMap.put("XXB", "鈻�");
+            dataMap.put("XXO", "鈻�");
+            dataMap.put("XXAB", "鈻�");
+        } else if (serviceDonatebaseinfo.getBloodtype().equals("2")) {
+            dataMap.put("XXA", "鈻�");
+            dataMap.put("XXB", (char) 8730);
+            dataMap.put("XXO", "鈻�");
+            dataMap.put("XXAB", "鈻�");
+        } else if (serviceDonatebaseinfo.getBloodtype().equals("3")) {
+            dataMap.put("XXA", "鈻�");
+            dataMap.put("XXB", "鈻�");
+            dataMap.put("XXO", (char) 8730);
+            dataMap.put("XXAB", "鈻�");
+        } else if (serviceDonatebaseinfo.getBloodtype().equals("4")) {
+            dataMap.put("XXA", "鈻�");
+            dataMap.put("XXB", "鈻�");
+            dataMap.put("XXO", "鈻�");
+            dataMap.put("XXAB", (char) 8730);
         }
-        if(serviceDonatebaseinfo.getRhyin().equals("1")){
-            dataMap.put("YX",(char)8730);
-       }else{
-            dataMap.put("YX","鈻�");
+        if (serviceDonatebaseinfo.getRhyin().equals("1")) {
+            dataMap.put("YX", (char) 8730);
+        } else {
+            dataMap.put("YX", "鈻�");
         }
 
         dataMap.put("JBZD", serviceDonatebaseinfo.getDiagnosisname() == null ? "" : serviceDonatebaseinfo.getDiagnosisname());
 
         //鐤剧梾绫诲瀷
-        if(serviceDonatebaseinfo.getDiseasetype().contains("0")){
-            dataMap.put("NXGYW",(char)8730);
-            if(serviceDonatebaseinfo.getDiseasetype().contains("1")){
-                dataMap.put("NWS",(char)8730);
-                if(serviceDonatebaseinfo.getDiseasetype().contains("2")){
-                    dataMap.put("QXQY",(char)8730);
-                    if(serviceDonatebaseinfo.getDiseasetype().contains("3")){
-                        dataMap.put("NZL",(char)8730);
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+        if (serviceDonatebaseinfo.getDiseasetype().contains("0")) {
+            dataMap.put("NXGYW", (char) 8730);
+            if (serviceDonatebaseinfo.getDiseasetype().contains("1")) {
+                dataMap.put("NWS", (char) 8730);
+                if (serviceDonatebaseinfo.getDiseasetype().contains("2")) {
+                    dataMap.put("QXQY", (char) 8730);
+                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+                        dataMap.put("NZL", (char) 8730);
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
-                    }else{
-                        dataMap.put("NZL","鈻�");
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+                    } else {
+                        dataMap.put("NZL", "鈻�");
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
                     }
-                }else{
-                    dataMap.put("QXQY","鈻�");
-                    if(serviceDonatebaseinfo.getDiseasetype().contains("3")){
-                        dataMap.put("NZL",(char)8730);
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+                } else {
+                    dataMap.put("QXQY", "鈻�");
+                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+                        dataMap.put("NZL", (char) 8730);
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
-                    }else{
-                        dataMap.put("NZL","鈻�");
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+                    } else {
+                        dataMap.put("NZL", "鈻�");
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
                     }
                 }
-            }else{
-                dataMap.put("NWS","鈻�");
-                if(serviceDonatebaseinfo.getDiseasetype().contains("2")){
-                    dataMap.put("QXQY",(char)8730);
-                    if(serviceDonatebaseinfo.getDiseasetype().contains("3")){
-                        dataMap.put("NZL",(char)8730);
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+            } else {
+                dataMap.put("NWS", "鈻�");
+                if (serviceDonatebaseinfo.getDiseasetype().contains("2")) {
+                    dataMap.put("QXQY", (char) 8730);
+                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+                        dataMap.put("NZL", (char) 8730);
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
-                    }else{
-                        dataMap.put("NZL","鈻�");
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+                    } else {
+                        dataMap.put("NZL", "鈻�");
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
                     }
-                }else{
-                    dataMap.put("QXQY","鈻�");
-                    if(serviceDonatebaseinfo.getDiseasetype().contains("3")){
-                        dataMap.put("NZL",(char)8730);
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+                } else {
+                    dataMap.put("QXQY", "鈻�");
+                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+                        dataMap.put("NZL", (char) 8730);
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
-                    }else{
-                        dataMap.put("NZL","鈻�");
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+                    } else {
+                        dataMap.put("NZL", "鈻�");
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
                     }
                 }
             }
-        }else{
-            dataMap.put("NXGYW","鈻�");
-            if(serviceDonatebaseinfo.getDiseasetype().contains("1")){
-                dataMap.put("NWS",(char)8730);
-                if(serviceDonatebaseinfo.getDiseasetype().contains("2")){
-                    dataMap.put("QXQY",(char)8730);
-                    if(serviceDonatebaseinfo.getDiseasetype().contains("3")){
-                        dataMap.put("NZL",(char)8730);
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+        } else {
+            dataMap.put("NXGYW", "鈻�");
+            if (serviceDonatebaseinfo.getDiseasetype().contains("1")) {
+                dataMap.put("NWS", (char) 8730);
+                if (serviceDonatebaseinfo.getDiseasetype().contains("2")) {
+                    dataMap.put("QXQY", (char) 8730);
+                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+                        dataMap.put("NZL", (char) 8730);
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
-                    }else{
-                        dataMap.put("NZL","鈻�");
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+                    } else {
+                        dataMap.put("NZL", "鈻�");
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
                     }
-                }else{
-                    dataMap.put("QXQY","鈻�");
-                    if(serviceDonatebaseinfo.getDiseasetype().contains("3")){
-                        dataMap.put("NZL",(char)8730);
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+                } else {
+                    dataMap.put("QXQY", "鈻�");
+                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+                        dataMap.put("NZL", (char) 8730);
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
-                    }else{
-                        dataMap.put("NZL","鈻�");
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+                    } else {
+                        dataMap.put("NZL", "鈻�");
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
                     }
                 }
-            }else{
-                dataMap.put("NWS","鈻�");
-                if(serviceDonatebaseinfo.getDiseasetype().contains("2")){
-                    dataMap.put("QXQY",(char)8730);
-                    if(serviceDonatebaseinfo.getDiseasetype().contains("3")){
-                        dataMap.put("NZL",(char)8730);
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+            } else {
+                dataMap.put("NWS", "鈻�");
+                if (serviceDonatebaseinfo.getDiseasetype().contains("2")) {
+                    dataMap.put("QXQY", (char) 8730);
+                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+                        dataMap.put("NZL", (char) 8730);
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
-                    }else{
-                        dataMap.put("NZL","鈻�");
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+                    } else {
+                        dataMap.put("NZL", "鈻�");
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
                     }
-                }else{
-                    dataMap.put("QXQY","鈻�");
-                    if(serviceDonatebaseinfo.getDiseasetype().contains("3")){
-                        dataMap.put("NZL",(char)8730);
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+                } else {
+                    dataMap.put("QXQY", "鈻�");
+                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
+                        dataMap.put("NZL", (char) 8730);
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
-                    }else{
-                        dataMap.put("NZL","鈻�");
-                        if(serviceDonatebaseinfo.getDiseasetype().contains("4")){
-                            dataMap.put("XXGJB",(char)8730);
-                        }else{
-                            dataMap.put("XXGJB","鈻�");
+                    } else {
+                        dataMap.put("NZL", "鈻�");
+                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
+                            dataMap.put("XXGJB", (char) 8730);
+                        } else {
+                            dataMap.put("XXGJB", "鈻�");
                         }
                     }
                 }
             }
         }
 
-        dataMap.put("JBLXQT",serviceDonatebaseinfo.getDiseasetypeOther() == null ? "":serviceDonatebaseinfo.getDiseasetypeOther());
+        dataMap.put("JBLXQT", serviceDonatebaseinfo.getDiseasetypeOther() == null ? "" : serviceDonatebaseinfo.getDiseasetypeOther());
 
 
         //浼犳煋鐥呮儏鍐�
-            if(serviceDonatebaseinfo.getInfectious().contains("1")){
-                dataMap.put("YG",(char)8730);
-                if(serviceDonatebaseinfo.getInfectious().contains("2")){
-                    dataMap.put("BG",(char)8730);
-                    if(serviceDonatebaseinfo.getInfectious().contains("3")){
-                        dataMap.put("MD",(char)8730);
-                        if(serviceDonatebaseinfo.getInfectious().contains("4")){
-                            dataMap.put("AZB",(char)8730);
-                        }else{
-                            dataMap.put("AZB","鈻�");
-                        }
-                    }else{
-                        dataMap.put("MD","鈻�");
-                        if(serviceDonatebaseinfo.getInfectious().contains("4")){
-                            dataMap.put("AZB",(char)8730);
-                        }else{
-                            dataMap.put("AZB","鈻�");
-                        }
+        if (serviceDonatebaseinfo.getInfectious().contains("1")) {
+            dataMap.put("YG", (char) 8730);
+            if (serviceDonatebaseinfo.getInfectious().contains("2")) {
+                dataMap.put("BG", (char) 8730);
+                if (serviceDonatebaseinfo.getInfectious().contains("3")) {
+                    dataMap.put("MD", (char) 8730);
+                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+                        dataMap.put("AZB", (char) 8730);
+                    } else {
+                        dataMap.put("AZB", "鈻�");
                     }
-                }else{
-                    dataMap.put("BG","鈻�");
-                    if(serviceDonatebaseinfo.getInfectious().contains("3")){
-                        dataMap.put("MD",(char)8730);
-                        if(serviceDonatebaseinfo.getInfectious().contains("4")){
-                            dataMap.put("AZB",(char)8730);
-                        }else{
-                            dataMap.put("AZB","鈻�");
-                        }
-                    }else{
-                        dataMap.put("MD","鈻�");
-                        if(serviceDonatebaseinfo.getInfectious().contains("4")){
-                            dataMap.put("AZB",(char)8730);
-                        }else{
-                            dataMap.put("AZB","鈻�");
-                        }
+                } else {
+                    dataMap.put("MD", "鈻�");
+                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+                        dataMap.put("AZB", (char) 8730);
+                    } else {
+                        dataMap.put("AZB", "鈻�");
                     }
                 }
-            }else{
-                dataMap.put("YG","鈻�");
-                if(serviceDonatebaseinfo.getInfectious().contains("2")){
-                    dataMap.put("BG",(char)8730);
-                    if(serviceDonatebaseinfo.getInfectious().contains("3")){
-                        dataMap.put("MD",(char)8730);
-                        if(serviceDonatebaseinfo.getInfectious().contains("4")){
-                            dataMap.put("AZB",(char)8730);
-                        }else{
-                            dataMap.put("AZB","鈻�");
-                        }
-                    }else{
-                        dataMap.put("MD","鈻�");
-                        if(serviceDonatebaseinfo.getInfectious().contains("4")){
-                            dataMap.put("AZB",(char)8730);
-                        }else{
-                            dataMap.put("AZB","鈻�");
-                        }
+            } else {
+                dataMap.put("BG", "鈻�");
+                if (serviceDonatebaseinfo.getInfectious().contains("3")) {
+                    dataMap.put("MD", (char) 8730);
+                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+                        dataMap.put("AZB", (char) 8730);
+                    } else {
+                        dataMap.put("AZB", "鈻�");
                     }
-                }else{
-                    dataMap.put("BG","鈻�");
-                    if(serviceDonatebaseinfo.getInfectious().contains("3")){
-                        dataMap.put("MD",(char)8730);
-                        if(serviceDonatebaseinfo.getInfectious().contains("4")){
-                            dataMap.put("AZB",(char)8730);
-                        }else{
-                            dataMap.put("AZB","鈻�");
-                        }
-                    }else{
-                        dataMap.put("MD","鈻�");
-                        if(serviceDonatebaseinfo.getInfectious().contains("4")){
-                            dataMap.put("AZB",(char)8730);
-                        }else{
-                            dataMap.put("AZB","鈻�");
-                        }
+                } else {
+                    dataMap.put("MD", "鈻�");
+                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+                        dataMap.put("AZB", (char) 8730);
+                    } else {
+                        dataMap.put("AZB", "鈻�");
                     }
                 }
             }
-            dataMap.put("CRBQT",serviceDonatebaseinfo.getInfectiousOther() == null ? "":serviceDonatebaseinfo.getInfectiousOther());
-            //鐥呬汉鐘跺喌
-            if(serviceDonatebaseinfo.getPatientstate().contains("0")){
-                dataMap.put("SDHM",(char)8730);
-                if(serviceDonatebaseinfo.getPatientstate().contains("1")){
-                    dataMap.put("WZZHX",(char)8730);
-                }else{
-                    dataMap.put("WZZHX","鈻�");
+        } else {
+            dataMap.put("YG", "鈻�");
+            if (serviceDonatebaseinfo.getInfectious().contains("2")) {
+                dataMap.put("BG", (char) 8730);
+                if (serviceDonatebaseinfo.getInfectious().contains("3")) {
+                    dataMap.put("MD", (char) 8730);
+                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+                        dataMap.put("AZB", (char) 8730);
+                    } else {
+                        dataMap.put("AZB", "鈻�");
+                    }
+                } else {
+                    dataMap.put("MD", "鈻�");
+                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+                        dataMap.put("AZB", (char) 8730);
+                    } else {
+                        dataMap.put("AZB", "鈻�");
+                    }
                 }
-            }else{
-                dataMap.put("SDHM","鈻�");
-                if(serviceDonatebaseinfo.getPatientstate().contains("1")){
-                    dataMap.put("WZZHX",(char)8730);
-                }else{
-                    dataMap.put("WZZHX","鈻�");
+            } else {
+                dataMap.put("BG", "鈻�");
+                if (serviceDonatebaseinfo.getInfectious().contains("3")) {
+                    dataMap.put("MD", (char) 8730);
+                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+                        dataMap.put("AZB", (char) 8730);
+                    } else {
+                        dataMap.put("AZB", "鈻�");
+                    }
+                } else {
+                    dataMap.put("MD", "鈻�");
+                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
+                        dataMap.put("AZB", (char) 8730);
+                    } else {
+                        dataMap.put("AZB", "鈻�");
+                    }
                 }
             }
+        }
+        dataMap.put("CRBQT", serviceDonatebaseinfo.getInfectiousOther() == null ? "" : serviceDonatebaseinfo.getInfectiousOther());
+        //鐥呬汉鐘跺喌
+        if (serviceDonatebaseinfo.getPatientstate().contains("0")) {
+            dataMap.put("SDHM", (char) 8730);
+            if (serviceDonatebaseinfo.getPatientstate().contains("1")) {
+                dataMap.put("WZZHX", (char) 8730);
+            } else {
+                dataMap.put("WZZHX", "鈻�");
+            }
+        } else {
+            dataMap.put("SDHM", "鈻�");
+            if (serviceDonatebaseinfo.getPatientstate().contains("1")) {
+                dataMap.put("WZZHX", (char) 8730);
+            } else {
+                dataMap.put("WZZHX", "鈻�");
+            }
+        }
 
         //鍏朵粬鎯呭喌
-        if(serviceDonatebaseinfo.getOthercases().contains("0")){
-            dataMap.put("JTSG",(char)8730);
-            if(serviceDonatebaseinfo.getOthercases().contains("1")){
-                dataMap.put("XSAJ",(char)8730);
-                if(serviceDonatebaseinfo.getOthercases().contains("2")){
-                    dataMap.put("GSSG",(char)8730);
-                    if(serviceDonatebaseinfo.getOthercases().contains("3")){
-                        dataMap.put("QTYWSG",(char)8730);
-                    }else{
-                        dataMap.put("QTYWSG","鈻�");
+        if (serviceDonatebaseinfo.getOthercases().contains("0")) {
+            dataMap.put("JTSG", (char) 8730);
+            if (serviceDonatebaseinfo.getOthercases().contains("1")) {
+                dataMap.put("XSAJ", (char) 8730);
+                if (serviceDonatebaseinfo.getOthercases().contains("2")) {
+                    dataMap.put("GSSG", (char) 8730);
+                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+                        dataMap.put("QTYWSG", (char) 8730);
+                    } else {
+                        dataMap.put("QTYWSG", "鈻�");
                     }
-                }else{
-                    dataMap.put("GSSG","鈻�");
-                    if(serviceDonatebaseinfo.getOthercases().contains("3")){
-                        dataMap.put("QTYWSG",(char)8730);
-                    }else{
-                        dataMap.put("QTYWSG","鈻�");
+                } else {
+                    dataMap.put("GSSG", "鈻�");
+                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+                        dataMap.put("QTYWSG", (char) 8730);
+                    } else {
+                        dataMap.put("QTYWSG", "鈻�");
                     }
                 }
-            }else{
-                dataMap.put("XSAJ","鈻�");
-                if(serviceDonatebaseinfo.getOthercases().contains("2")){
-                    dataMap.put("GSSG",(char)8730);
-                    if(serviceDonatebaseinfo.getOthercases().contains("3")){
-                        dataMap.put("QTYWSG",(char)8730);
-                    }else{
-                        dataMap.put("QTYWSG","鈻�");
+            } else {
+                dataMap.put("XSAJ", "鈻�");
+                if (serviceDonatebaseinfo.getOthercases().contains("2")) {
+                    dataMap.put("GSSG", (char) 8730);
+                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+                        dataMap.put("QTYWSG", (char) 8730);
+                    } else {
+                        dataMap.put("QTYWSG", "鈻�");
                     }
-                }else{
-                    dataMap.put("GSSG","鈻�");
-                    if(serviceDonatebaseinfo.getOthercases().contains("3")){
-                        dataMap.put("QTYWSG",(char)8730);
-                    }else{
-                        dataMap.put("QTYWSG","鈻�");
+                } else {
+                    dataMap.put("GSSG", "鈻�");
+                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+                        dataMap.put("QTYWSG", (char) 8730);
+                    } else {
+                        dataMap.put("QTYWSG", "鈻�");
                     }
                 }
             }
-        }else{
-            dataMap.put("JTSG","鈻�");
-            if(serviceDonatebaseinfo.getOthercases().contains("1")){
-                dataMap.put("XSAJ",(char)8730);
-                if(serviceDonatebaseinfo.getOthercases().contains("2")){
-                    dataMap.put("GSSG",(char)8730);
-                    if(serviceDonatebaseinfo.getOthercases().contains("3")){
-                        dataMap.put("QTYWSG",(char)8730);
-                    }else{
-                        dataMap.put("QTYWSG","鈻�");
+        } else {
+            dataMap.put("JTSG", "鈻�");
+            if (serviceDonatebaseinfo.getOthercases().contains("1")) {
+                dataMap.put("XSAJ", (char) 8730);
+                if (serviceDonatebaseinfo.getOthercases().contains("2")) {
+                    dataMap.put("GSSG", (char) 8730);
+                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+                        dataMap.put("QTYWSG", (char) 8730);
+                    } else {
+                        dataMap.put("QTYWSG", "鈻�");
                     }
-                }else{
-                    dataMap.put("GSSG","鈻�");
-                    if(serviceDonatebaseinfo.getOthercases().contains("3")){
-                        dataMap.put("QTYWSG",(char)8730);
-                    }else{
-                        dataMap.put("QTYWSG","鈻�");
+                } else {
+                    dataMap.put("GSSG", "鈻�");
+                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+                        dataMap.put("QTYWSG", (char) 8730);
+                    } else {
+                        dataMap.put("QTYWSG", "鈻�");
                     }
                 }
-            }else{
-                dataMap.put("XSAJ","鈻�");
-                if(serviceDonatebaseinfo.getOthercases().contains("2")){
-                    dataMap.put("GSSG",(char)8730);
-                    if(serviceDonatebaseinfo.getOthercases().contains("3")){
-                        dataMap.put("QTYWSG",(char)8730);
-                    }else{
-                        dataMap.put("QTYWSG","鈻�");
+            } else {
+                dataMap.put("XSAJ", "鈻�");
+                if (serviceDonatebaseinfo.getOthercases().contains("2")) {
+                    dataMap.put("GSSG", (char) 8730);
+                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+                        dataMap.put("QTYWSG", (char) 8730);
+                    } else {
+                        dataMap.put("QTYWSG", "鈻�");
                     }
-                }else{
-                    dataMap.put("GSSG","鈻�");
-                    if(serviceDonatebaseinfo.getOthercases().contains("3")){
-                        dataMap.put("QTYWSG",(char)8730);
-                    }else{
-                        dataMap.put("QTYWSG","鈻�");
+                } else {
+                    dataMap.put("GSSG", "鈻�");
+                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
+                        dataMap.put("QTYWSG", (char) 8730);
+                    } else {
+                        dataMap.put("QTYWSG", "鈻�");
                     }
                 }
             }
         }
 
-       //鎯呬翰灞炲叧绯绘儏鍐�
-        if(serviceDonatebaseinfo.getKinship().contains("0")){
-            dataMap.put("PE",(char)8730);
-            if(serviceDonatebaseinfo.getKinship().contains("1")){
-                dataMap.put("ZN",(char)8730);
-                if(serviceDonatebaseinfo.getKinship().contains("2")){
-                    dataMap.put("FQ",(char)8730);
-                    if(serviceDonatebaseinfo.getKinship().contains("3")){
-                        dataMap.put("MQ",(char)8730);
-                    }else{
-                        dataMap.put("MQ","鈻�");
+        //鎯呬翰灞炲叧绯绘儏鍐�
+        if (serviceDonatebaseinfo.getKinship().contains("0")) {
+            dataMap.put("PE", (char) 8730);
+            if (serviceDonatebaseinfo.getKinship().contains("1")) {
+                dataMap.put("ZN", (char) 8730);
+                if (serviceDonatebaseinfo.getKinship().contains("2")) {
+                    dataMap.put("FQ", (char) 8730);
+                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
+                        dataMap.put("MQ", (char) 8730);
+                    } else {
+                        dataMap.put("MQ", "鈻�");
                     }
-                }else{
-                    dataMap.put("FQ","鈻�");
-                    if(serviceDonatebaseinfo.getKinship().contains("3")){
-                        dataMap.put("MQ",(char)8730);
-                    }else{
-                        dataMap.put("MQ","鈻�");
+                } else {
+                    dataMap.put("FQ", "鈻�");
+                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
+                        dataMap.put("MQ", (char) 8730);
+                    } else {
+                        dataMap.put("MQ", "鈻�");
                     }
                 }
-            }else{
-                dataMap.put("ZN","鈻�");
-                if(serviceDonatebaseinfo.getKinship().contains("2")){
-                    dataMap.put("FQ",(char)8730);
-                    if(serviceDonatebaseinfo.getKinship().contains("3")){
-                        dataMap.put("MQ",(char)8730);
-                    }else{
-                        dataMap.put("MQ","鈻�");
+            } else {
+                dataMap.put("ZN", "鈻�");
+                if (serviceDonatebaseinfo.getKinship().contains("2")) {
+                    dataMap.put("FQ", (char) 8730);
+                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
+                        dataMap.put("MQ", (char) 8730);
+                    } else {
+                        dataMap.put("MQ", "鈻�");
                     }
-                }else{
-                    dataMap.put("FQ","鈻�");
-                    if(serviceDonatebaseinfo.getKinship().contains("3")){
-                        dataMap.put("MQ",(char)8730);
-                    }else{
-                        dataMap.put("MQ","鈻�");
+                } else {
+                    dataMap.put("FQ", "鈻�");
+                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
+                        dataMap.put("MQ", (char) 8730);
+                    } else {
+                        dataMap.put("MQ", "鈻�");
                     }
                 }
             }
-        }else{
-            dataMap.put("PE","鈻�");
-            if(serviceDonatebaseinfo.getKinship().contains("1")){
-                dataMap.put("ZN",(char)8730);
-                if(serviceDonatebaseinfo.getKinship().contains("2")){
-                    dataMap.put("FQ",(char)8730);
-                    if(serviceDonatebaseinfo.getKinship().contains("3")){
-                        dataMap.put("MQ",(char)8730);
-                    }else{
-                        dataMap.put("MQ","鈻�");
+        } else {
+            dataMap.put("PE", "鈻�");
+            if (serviceDonatebaseinfo.getKinship().contains("1")) {
+                dataMap.put("ZN", (char) 8730);
+                if (serviceDonatebaseinfo.getKinship().contains("2")) {
+                    dataMap.put("FQ", (char) 8730);
+                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
+                        dataMap.put("MQ", (char) 8730);
+                    } else {
+                        dataMap.put("MQ", "鈻�");
                     }
-                }else{
-                    dataMap.put("FQ","鈻�");
-                    if(serviceDonatebaseinfo.getKinship().contains("3")){
-                        dataMap.put("MQ",(char)8730);
-                    }else{
-                        dataMap.put("MQ","鈻�");
+                } else {
+                    dataMap.put("FQ", "鈻�");
+                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
+                        dataMap.put("MQ", (char) 8730);
+                    } else {
+                        dataMap.put("MQ", "鈻�");
                     }
                 }
-            }else{
-                dataMap.put("ZN","鈻�");
-                if(serviceDonatebaseinfo.getKinship().contains("2")){
-                    dataMap.put("FQ",(char)8730);
-                    if(serviceDonatebaseinfo.getKinship().contains("3")){
-                        dataMap.put("MQ",(char)8730);
-                    }else{
-                        dataMap.put("MQ","鈻�");
+            } else {
+                dataMap.put("ZN", "鈻�");
+                if (serviceDonatebaseinfo.getKinship().contains("2")) {
+                    dataMap.put("FQ", (char) 8730);
+                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
+                        dataMap.put("MQ", (char) 8730);
+                    } else {
+                        dataMap.put("MQ", "鈻�");
                     }
-                }else{
-                    dataMap.put("FQ","鈻�");
-                    if(serviceDonatebaseinfo.getKinship().contains("3")){
-                        dataMap.put("MQ",(char)8730);
-                    }else{
-                        dataMap.put("MQ","鈻�");
+                } else {
+                    dataMap.put("FQ", "鈻�");
+                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
+                        dataMap.put("MQ", (char) 8730);
+                    } else {
+                        dataMap.put("MQ", "鈻�");
                     }
                 }
             }
         }
-        dataMap.put("QSQT",serviceDonatebaseinfo.getKinshipOther() == null ? "": serviceDonatebaseinfo.getKinshipOther());
+        dataMap.put("QSQT", serviceDonatebaseinfo.getKinshipOther() == null ? "" : serviceDonatebaseinfo.getKinshipOther());
 
         //鏈汉鎹愮尞
-        if(serviceDonatebaseinfo.getSelfwill().contains("0")){
-            dataMap.put("ZYDJ",(char)8730);
-            if(serviceDonatebaseinfo.getSelfwill().contains("1")){
-                dataMap.put("SMTY",(char)8730);
-                if(serviceDonatebaseinfo.getSelfwill().contains("2")){
-                    dataMap.put("KTTY",(char)8730);
-                    if(serviceDonatebaseinfo.getSelfwill().contains("3")){
-                        dataMap.put("WBSBTY",(char)8730);
-                    }else{
-                        dataMap.put("WBSBTY","鈻�");
+        if (serviceDonatebaseinfo.getSelfwill().contains("0")) {
+            dataMap.put("ZYDJ", (char) 8730);
+            if (serviceDonatebaseinfo.getSelfwill().contains("1")) {
+                dataMap.put("SMTY", (char) 8730);
+                if (serviceDonatebaseinfo.getSelfwill().contains("2")) {
+                    dataMap.put("KTTY", (char) 8730);
+                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+                        dataMap.put("WBSBTY", (char) 8730);
+                    } else {
+                        dataMap.put("WBSBTY", "鈻�");
                     }
-                }else{
-                    dataMap.put("KTTY","鈻�");
-                    if(serviceDonatebaseinfo.getSelfwill().contains("3")){
-                        dataMap.put("WBSBTY",(char)8730);
-                    }else{
-                        dataMap.put("WBSBTY","鈻�");
+                } else {
+                    dataMap.put("KTTY", "鈻�");
+                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+                        dataMap.put("WBSBTY", (char) 8730);
+                    } else {
+                        dataMap.put("WBSBTY", "鈻�");
                     }
                 }
-            }else{
-                dataMap.put("SMTY","鈻�");
-                if(serviceDonatebaseinfo.getSelfwill().contains("2")){
-                    dataMap.put("KTTY",(char)8730);
-                    if(serviceDonatebaseinfo.getSelfwill().contains("3")){
-                        dataMap.put("WBSBTY",(char)8730);
-                    }else{
-                        dataMap.put("WBSBTY","鈻�");
+            } else {
+                dataMap.put("SMTY", "鈻�");
+                if (serviceDonatebaseinfo.getSelfwill().contains("2")) {
+                    dataMap.put("KTTY", (char) 8730);
+                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+                        dataMap.put("WBSBTY", (char) 8730);
+                    } else {
+                        dataMap.put("WBSBTY", "鈻�");
                     }
-                }else{
-                    dataMap.put("KTTY","鈻�");
-                    if(serviceDonatebaseinfo.getSelfwill().contains("3")){
-                        dataMap.put("WBSBTY",(char)8730);
-                    }else{
-                        dataMap.put("WBSBTY","鈻�");
+                } else {
+                    dataMap.put("KTTY", "鈻�");
+                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+                        dataMap.put("WBSBTY", (char) 8730);
+                    } else {
+                        dataMap.put("WBSBTY", "鈻�");
                     }
                 }
             }
-        }else{
-            dataMap.put("ZYDJ","鈻�");
-            if(serviceDonatebaseinfo.getSelfwill().contains("1")){
-                dataMap.put("SMTY",(char)8730);
-                if(serviceDonatebaseinfo.getSelfwill().contains("2")){
-                    dataMap.put("KTTY",(char)8730);
-                    if(serviceDonatebaseinfo.getSelfwill().contains("3")){
-                        dataMap.put("WBSBTY",(char)8730);
-                    }else{
-                        dataMap.put("WBSBTY","鈻�");
+        } else {
+            dataMap.put("ZYDJ", "鈻�");
+            if (serviceDonatebaseinfo.getSelfwill().contains("1")) {
+                dataMap.put("SMTY", (char) 8730);
+                if (serviceDonatebaseinfo.getSelfwill().contains("2")) {
+                    dataMap.put("KTTY", (char) 8730);
+                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+                        dataMap.put("WBSBTY", (char) 8730);
+                    } else {
+                        dataMap.put("WBSBTY", "鈻�");
                     }
-                }else{
-                    dataMap.put("KTTY","鈻�");
-                    if(serviceDonatebaseinfo.getSelfwill().contains("3")){
-                        dataMap.put("WBSBTY",(char)8730);
-                    }else{
-                        dataMap.put("WBSBTY","鈻�");
+                } else {
+                    dataMap.put("KTTY", "鈻�");
+                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+                        dataMap.put("WBSBTY", (char) 8730);
+                    } else {
+                        dataMap.put("WBSBTY", "鈻�");
                     }
                 }
-            }else{
-                dataMap.put("SMTY","鈻�");
-                if(serviceDonatebaseinfo.getSelfwill().contains("2")){
-                    dataMap.put("KTTY",(char)8730);
-                    if(serviceDonatebaseinfo.getSelfwill().contains("3")){
-                        dataMap.put("WBSBTY",(char)8730);
-                    }else{
-                        dataMap.put("WBSBTY","鈻�");
+            } else {
+                dataMap.put("SMTY", "鈻�");
+                if (serviceDonatebaseinfo.getSelfwill().contains("2")) {
+                    dataMap.put("KTTY", (char) 8730);
+                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+                        dataMap.put("WBSBTY", (char) 8730);
+                    } else {
+                        dataMap.put("WBSBTY", "鈻�");
                     }
-                }else{
-                    dataMap.put("KTTY","鈻�");
-                    if(serviceDonatebaseinfo.getSelfwill().contains("3")){
-                        dataMap.put("WBSBTY",(char)8730);
-                    }else{
-                        dataMap.put("WBSBTY","鈻�");
+                } else {
+                    dataMap.put("KTTY", "鈻�");
+                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
+                        dataMap.put("WBSBTY", (char) 8730);
+                    } else {
+                        dataMap.put("WBSBTY", "鈻�");
                     }
                 }
             }
         }
-        dataMap.put("ZYQS",serviceDonatebaseinfo.getMajorrelatives() == null ? "" : serviceDonatebaseinfo.getMajorrelatives());
-        dataMap.put("YJXZGX",serviceDonatebaseinfo.getFamilyrelations() == null ? "":serviceDonatebaseinfo.getFamilyrelations());
+        dataMap.put("ZYQS", serviceDonatebaseinfo.getMajorrelatives() == null ? "" : serviceDonatebaseinfo.getMajorrelatives());
+        dataMap.put("YJXZGX", serviceDonatebaseinfo.getFamilyrelations() == null ? "" : serviceDonatebaseinfo.getFamilyrelations());
 
-        if(serviceDonatebaseinfo.getFamilyrelations() == null){
-            dataMap.put("YJXZGX","");
+        if (serviceDonatebaseinfo.getFamilyrelations() == null) {
+            dataMap.put("YJXZGX", "");
+        } 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", "瀛�");
+        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("3")) {
+            dataMap.put("YJXZGX", "濂�");
+        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("4")) {
+            dataMap.put("YJXZGX", "鐖舵瘝");
+        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("5")) {
+            dataMap.put("YJXZGX", "鐖风埛");
+        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("6")) {
+            dataMap.put("YJXZGX", "鍏朵粬");
         }
-       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","瀛�");
-       }else if(serviceDonatebaseinfo.getFamilyrelations().equals("3")){
-           dataMap.put("YJXZGX","濂�");
-       }else if(serviceDonatebaseinfo.getFamilyrelations().equals("4")){
-           dataMap.put("YJXZGX","鐖舵瘝");
-       }else if(serviceDonatebaseinfo.getFamilyrelations().equals("5")){
-           dataMap.put("YJXZGX","鐖风埛");
-       }else if(serviceDonatebaseinfo.getFamilyrelations().equals("6")){
-           dataMap.put("YJXZGX","鍏朵粬");
-       }
         //淇℃伅鏉ユ簮
-        if(serviceDonatebaseinfo.getInfosources().contains("鍖荤枟鏈烘瀯")){
-            dataMap.put("YLJG",(char)8730);
-            if(serviceDonatebaseinfo.getInfosources().contains("瀹跺睘")){
-                dataMap.put("QS",(char)8730);
-                if(serviceDonatebaseinfo.getInfosources().contains("浜ら��")){
-                    dataMap.put("JT",(char)8730);
-                    if(serviceDonatebaseinfo.getInfosources().contains("鍏畨")){
-                        dataMap.put("GA",(char)8730);
-                    }else{
-                        dataMap.put("GA","鈻�");
+        if (serviceDonatebaseinfo.getInfosources().contains("鍖荤枟鏈烘瀯")) {
+            dataMap.put("YLJG", (char) 8730);
+            if (serviceDonatebaseinfo.getInfosources().contains("瀹跺睘")) {
+                dataMap.put("QS", (char) 8730);
+                if (serviceDonatebaseinfo.getInfosources().contains("浜ら��")) {
+                    dataMap.put("JT", (char) 8730);
+                    if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+                        dataMap.put("GA", (char) 8730);
+                    } else {
+                        dataMap.put("GA", "鈻�");
                     }
-                }else{
-                    dataMap.put("JT","鈻�");
-                    if(serviceDonatebaseinfo.getInfosources().contains("鍏畨")){
-                        dataMap.put("GA",(char)8730);
-                    }else{
-                        dataMap.put("GA","鈻�");
+                } else {
+                    dataMap.put("JT", "鈻�");
+                    if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+                        dataMap.put("GA", (char) 8730);
+                    } else {
+                        dataMap.put("GA", "鈻�");
                     }
                 }
-            }else{
-                dataMap.put("QS","鈻�");
-                if(serviceDonatebaseinfo.getInfosources().contains("浜ら��")){
-                    dataMap.put("JT",(char)8730);
-                    if(serviceDonatebaseinfo.getInfosources().contains("鍏畨")){
-                        dataMap.put("GA",(char)8730);
-                    }else{
-                        dataMap.put("GA","鈻�");
+            } else {
+                dataMap.put("QS", "鈻�");
+                if (serviceDonatebaseinfo.getInfosources().contains("浜ら��")) {
+                    dataMap.put("JT", (char) 8730);
+                    if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+                        dataMap.put("GA", (char) 8730);
+                    } else {
+                        dataMap.put("GA", "鈻�");
                     }
-                }else{
-                    dataMap.put("JT","鈻�");
-                    if(serviceDonatebaseinfo.getInfosources().contains("鍏畨")){
-                        dataMap.put("GA",(char)8730);
-                    }else{
-                        dataMap.put("GA","鈻�");
+                } else {
+                    dataMap.put("JT", "鈻�");
+                    if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+                        dataMap.put("GA", (char) 8730);
+                    } else {
+                        dataMap.put("GA", "鈻�");
                     }
                 }
             }
-        }else{
-            dataMap.put("YLJG","鈻�");
-            if(serviceDonatebaseinfo.getInfosources().contains("瀹跺睘")){
-                dataMap.put("QS",(char)8730);
-                if(serviceDonatebaseinfo.getInfosources().contains("浜ら��")){
-                    dataMap.put("JT",(char)8730);
-                    if(serviceDonatebaseinfo.getInfosources().contains("鍏畨")){
-                        dataMap.put("GA",(char)8730);
-                    }else{
-                        dataMap.put("GA","鈻�");
+        } else {
+            dataMap.put("YLJG", "鈻�");
+            if (serviceDonatebaseinfo.getInfosources().contains("瀹跺睘")) {
+                dataMap.put("QS", (char) 8730);
+                if (serviceDonatebaseinfo.getInfosources().contains("浜ら��")) {
+                    dataMap.put("JT", (char) 8730);
+                    if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+                        dataMap.put("GA", (char) 8730);
+                    } else {
+                        dataMap.put("GA", "鈻�");
                     }
-                }else{
-                    dataMap.put("JT","鈻�");
-                    if(serviceDonatebaseinfo.getInfosources().contains("鍏畨")){
-                        dataMap.put("GA",(char)8730);
-                    }else{
-                        dataMap.put("GA","鈻�");
+                } else {
+                    dataMap.put("JT", "鈻�");
+                    if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+                        dataMap.put("GA", (char) 8730);
+                    } else {
+                        dataMap.put("GA", "鈻�");
                     }
                 }
-            }else{
-                dataMap.put("QS","鈻�");
-                if(serviceDonatebaseinfo.getInfosources().contains("浜ら��")){
-                    dataMap.put("JT",(char)8730);
-                    if(serviceDonatebaseinfo.getInfosources().contains("鍏畨")){
-                        dataMap.put("GA",(char)8730);
-                    }else{
-                        dataMap.put("GA","鈻�");
+            } else {
+                dataMap.put("QS", "鈻�");
+                if (serviceDonatebaseinfo.getInfosources().contains("浜ら��")) {
+                    dataMap.put("JT", (char) 8730);
+                    if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+                        dataMap.put("GA", (char) 8730);
+                    } else {
+                        dataMap.put("GA", "鈻�");
                     }
-                }else{
-                    dataMap.put("JT","鈻�");
-                    if(serviceDonatebaseinfo.getInfosources().contains("鍏畨")){
-                        dataMap.put("GA",(char)8730);
-                    }else{
-                        dataMap.put("GA","鈻�");
+                } else {
+                    dataMap.put("JT", "鈻�");
+                    if (serviceDonatebaseinfo.getInfosources().contains("鍏畨")) {
+                        dataMap.put("GA", (char) 8730);
+                    } else {
+                        dataMap.put("GA", "鈻�");
                     }
                 }
             }
         }
-        dataMap.put("XXLYQT",serviceDonatebaseinfo.getInfosourcesOther() == null ? "": serviceDonatebaseinfo.getInfosourcesOther());
-        dataMap.put("HSZH",serviceDonatebaseinfo.getRedorganname() == null ? "": serviceDonatebaseinfo.getRedorganname());
-        dataMap.put("LXR",serviceDonatebaseinfo.getContactperson() == null ? "" : serviceDonatebaseinfo.getContactperson());
+        dataMap.put("XXLYQT", serviceDonatebaseinfo.getInfosourcesOther() == null ? "" : serviceDonatebaseinfo.getInfosourcesOther());
+        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);
-        dataMap.put("HQZZ",serviceDonatebaseinfo.getAcquisitiontissuename() == null ? "" :serviceDonatebaseinfo.getAcquisitiontissuename());
-        dataMap.put("BGR",serviceDonatebaseinfo.getReportername() == null ? "" : serviceDonatebaseinfo.getReportername());
-        dataMap.put("BGRDH",serviceDonatebaseinfo.getReporterphone() == null ? "" :serviceDonatebaseinfo.getReporterphone());
-        
+        dataMap.put("LXSJ", serviceDonatebaseinfo.getContacttime() == null ? "" : time1);
+        dataMap.put("HQZZ", serviceDonatebaseinfo.getAcquisitiontissuename() == null ? "" : serviceDonatebaseinfo.getAcquisitiontissuename());
+        dataMap.put("BGR", serviceDonatebaseinfo.getReportername() == null ? "" : serviceDonatebaseinfo.getReportername());
+        dataMap.put("BGRDH", serviceDonatebaseinfo.getReporterphone() == null ? "" : serviceDonatebaseinfo.getReporterphone());
+
     }
 
     @ApiOperation("鑾峰彇鐘舵�佽幏鍙栬鏁�")
     @GetMapping("/countByRecordState")
-    public AjaxResult countByRecordState(TimeVO timeVO){
+    public AjaxResult countByRecordState(TimeVO timeVO) {
         return AjaxResult.success(serviceDonatebaseinfoService.countByRecordState(timeVO));
     }
 

--
Gitblit v1.9.3