加sex等

hjzx-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -116,7 +116,7 @@ public class WorkOrderBaseController extends BaseController {
         qw.eq(input.getFirsttype()!=null && input.getFirsttype()>0,WorkOrderBase::getFirsttype, input.getFirsttype());
         qw.like(!StringHelper.isEmpty(input.getCallnum()), WorkOrderBase::getCallnum, input.getCallnum());
         qw.like(!StringHelper.isEmpty(input.getCaller()), WorkOrderBase::getCaller, input.getCaller());
-
+        qw.eq(!StringHelper.isEmpty(input.getSex()), WorkOrderBase::getSex, input.getSex());
 
         qw.like(!StringHelper.isEmpty(input.getWorkordercode()), WorkOrderBase::getWorkordercode, input.getWorkordercode());
 
@@ -251,7 +251,7 @@ public class WorkOrderBaseController extends BaseController {
         qw.like(!StringHelper.isEmpty(input.getCallnum()), WorkOrderBase::getCallnum, input.getCallnum());
         qw.like(!StringHelper.isEmpty(input.getCaller()), WorkOrderBase::getCaller, input.getCaller());
 
-
+        qw.eq(!StringHelper.isEmpty(input.getSex()), WorkOrderBase::getSex, input.getSex());
         qw.like(!StringHelper.isEmpty(input.getWorkordercode()), WorkOrderBase::getWorkordercode, input.getWorkordercode());
 
         qw.eq(input.getRestartsnum() != null && input.getRestartsnum() >= 0, WorkOrderBase::getRestartsnum, input.getRestartsnum());
@@ -303,14 +303,6 @@ public class WorkOrderBaseController extends BaseController {
             switch (listType) {
                 //综合查询列表 kfyy 和admin可以看全部工单，其他人只能看见自己创建的或者自己处理的工单
                 case 0:
-//                if(!(roleList.stream().anyMatch(o  -> o.getRoleKey().equals("admin"))  ||   roleList.stream().anyMatch(o -> o.getRoleKey().equals("kfyy"))))
-//                {
-//
-//                    qw.eq(WorkOrderBase::getCreateuser, CurrentUser().getUserName())
-//                            .or()
-//                            .eq(WorkOrderBase::getDealuser, CurrentUser().getUserName());
-//                }
-
                     break;
                 //（处理人）我的待处理
                 case 1:
@@ -440,9 +432,6 @@ List<WorkOrderType> typelist=workrodertypeService.getList();
                         .map(DictData::getDictLabel)
                         .orElse(null) );
             }
-//        private  String previousPsychotherapyName;
-//        private  String concretePlanName;
-//        private  String handlingMeasuresName;  if(!StringHelper.isEmpty(orderBase.getTreatNow())){
             if(!StringHelper.isEmpty(orderBase.getPreviousPsychotherapy())){
                 //  if(orderBase.getPreviousPsychotherapy()!=null && orderBase.getPreviousPsychotherapy()>0){
                 orderBase.setPreviousPsychotherapyName(dictDatas.stream()
@@ -461,14 +450,6 @@ List<WorkOrderType> typelist=workrodertypeService.getList();
                         .orElse(null) );
             }
             if(!StringHelper.isEmpty(orderBase.getHandlingMeasures())){
-                //    if(orderBase.getHandlingMeasures()!=null && orderBase.getHandlingMeasures()>0){
-//                orderBase.setHandlingMeasuresName(dictDatas.stream()
-//                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getHandlingMeasures()))
-//                        .findFirst()
-//                        .map(DictData::getDictLabel)
-//                        .orElse(null) );
-
-
                 // 通过Stream过滤并生成新List
                 String[] targetNames = orderBase.getHandlingMeasures().split(",");
                 // 转换为Set以提高查询效率
@@ -483,9 +464,6 @@ List<WorkOrderType> typelist=workrodertypeService.getList();
 
 
         List<ExportWorkOrderBaseView>  baseView=  JSON.parseArray(JSON.toJSONString(View),ExportWorkOrderBaseView.class);
-
-
-
         ExcelHelper<ExportWorkOrderBaseView> excel = new ExcelHelper<>(ExportWorkOrderBaseView.class);
         excel.exportExcel("xlsx", baseView);
     }
@@ -633,7 +611,14 @@ List<WorkOrderType> typelist=workrodertypeService.getList();
                 pt.setIsDelete(0L);
                 pt.setSource(PatientSource.CALL.getValue());
                 pt.setName(input.getCaller());
-
+                 if(!StringHelper.isEmpty( input.getSex())){
+                   if(Objects.equals(input.getSex(), "男")){
+                       pt.setSex(1L);
+                   }
+                     if(Objects.equals(input.getSex(), "女")){
+                         pt.setSex(2L);
+                     }
+                 }
                 pt.setPatientId(uuid.toString());
                 try {
                     if (StringHelper.isNotBlank(input.getCallnum())) {

hjzx-api/src/main/resources/application-dev.yml

@@ -6,7 +6,8 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.200:3306/hjzx_xinxiang?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+    #url: jdbc:mysql://192.168.1.200:3306/hjzx_xinxiang?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://192.168.1.8:3306/xlrx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
     username: root
     password: 800100
 

hjzx-entity/src/main/java/api/entity/database/order/WorkOrderBase.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -57,9 +58,11 @@ public class WorkOrderBase {
     private String result;
     /** createtime */
     @ApiModelProperty("createtime")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createtime;
     /** endtime */
     @ApiModelProperty("endtime")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date endtime;
     /** createuser */
     @ApiModelProperty("createuser")
@@ -187,4 +190,7 @@ public class WorkOrderBase {
 
     @ApiModelProperty("年龄分组")
     private String ageGroup;
+
+    @ApiModelProperty("性别")
+    private String sex;
 }

hjzx-entity/src/main/java/api/entity/database/patient/Patient.java

@@ -47,7 +47,7 @@ public class Patient {
     @ApiModelProperty("住址")
     private String address;
     /** 性别 */
-    @ApiModelProperty("性别")
+    @ApiModelProperty("性别,0未知 1男2女")
     private Long sex;
     /** 医保卡号 */
     @ApiModelProperty("医保卡号")

hjzx-entity/src/main/java/api/entity/view/order/ExportWorkOrderBaseView.java

@@ -112,7 +112,8 @@ public class ExportWorkOrderBaseView {
 
     @ApiModelProperty("年龄分组")
     private String ageGroup;
-
+    @ApiModelProperty("性别")
+    private  String  sex;
     @ApiModelProperty("学历")
     private  String gradeName;
     @ApiModelProperty("婚姻情况")
@@ -138,4 +139,6 @@ public class ExportWorkOrderBaseView {
 
 
 
+
+
 }

hjzx-util/src/main/java/api/util/helper/ExcelHelper.java

@@ -316,7 +316,7 @@ public class ExcelHelper<T> {
             cellStyle.setBorderLeft(BorderStyle.THIN);
             cellStyle.setBorderRight(BorderStyle.THIN);
             cellStyle.setAlignment(HorizontalAlignment.CENTER);
-
+            cellStyle.setWrapText(true); // 启用自动换行
 
             int limit=60000;
             int rowindex=0;
@@ -350,7 +350,10 @@ public class ExcelHelper<T> {
                         }
                     }
                 }
-                sheet.setColumnWidth(columnNum, columnWidth * 256);
+                columnWidth = Math.min(columnWidth, 255);
+               sheet.setColumnWidth(columnNum, columnWidth * 256);
+
+               // sheet.autoSizeColumn(columnNum);
             }
 
 
@@ -582,7 +585,9 @@ public class ExcelHelper<T> {
                         }
                     }
                 }
+                columnWidth = Math.min(columnWidth, 255);
                 sheet.setColumnWidth(columnNum, columnWidth * 256);
+              //  sheet.autoSizeColumn(columnNum);
             }
 
 
@@ -605,7 +610,7 @@ public class ExcelHelper<T> {
                 out.write(JSON.toJSONString(map));
                 out.flush();
                 out.close();
-            } catch (IOException ex) {
+             } catch (IOException ex) {
                 throw new RuntimeException(ex);
             }
         }
@@ -678,6 +683,7 @@ public class ExcelHelper<T> {
                         }
                     }
                 }
+                columnWidth = Math.min(columnWidth, 255);
                 sheet.setColumnWidth(columnNum, columnWidth * 256);
             }