1

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -237,6 +237,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/export/qualityControlExport").permitAll()
                 .antMatchers("/consoleByDept/qualityControlByDept").permitAll()
                 .antMatchers("/print/export/qualityControlExportByDept").permitAll()
+                .antMatchers("/qc/data/sendTemplateInfos").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -281,6 +281,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/export/qualityControlExport", request)
                 || matchers("/consoleByDept/qualityControlByDept", request)
                 || matchers("/print/export/qualityControlExportByDept", request)
+                || matchers("/qc/data/sendTemplateInfos", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/entity/MedRecordType.java

@@ -52,6 +52,10 @@ public class MedRecordType implements Serializable {
      * 拼音
      */
     private String spell;
+    /**
+     * 内容
+     */
+    private String content;
 
     private String remark;
 

src/main/java/com/diagbot/facade/data/AMedRecordTypeFacade.java

@@ -34,39 +34,41 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
      */
     public void executeMRType() {
         //String sql="select * from ar_medirecclass where SFZFPB='1'";
-        String sql="select * from ar_medirecclass where SFZFPB='1' and cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
+        String sql = "select * from ar_medirecclass where SFZFPB='1' and cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
         List<MedRecordType> medRecordTypeList = tzDBConn.getMedicalRecordType(sql);
         execute(medRecordTypeList);
     }
+
     /**
      * 数据引擎-通过接口更新病人住院记录信息
+     *
      * @param list
      * @return
      */
     public RespDTO<List<AMedicalRecordTypeDTO>> executeMRType(List<AMedicalRecordTypeVO> list) {
-        if(list!=null && list.size()>0){
+        if (list != null && list.size() > 0) {
             //循环验证数据有效性
-            for (AMedicalRecordTypeVO medRecordType:list) {
-                if("".equals(medRecordType.getTypeId())) {
+            for (AMedicalRecordTypeVO medRecordType : list) {
+                if ("".equals(medRecordType.getTypeId())) {
                     return RespDTO.onError("请输入文书类型编码!");
-                }else if(medRecordType.getHospitalId()==null){
+                } else if (medRecordType.getHospitalId() == null) {
                     return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(medRecordType.getTypeName())){
+                } else if ("".equals(medRecordType.getTypeName())) {
                     return RespDTO.onError("请文书类型名称!");
                 }
             }
-            List<MedRecordType> medRecordTypeList=Lists.newArrayList();
-            List<AMedicalRecordTypeDTO> medRecordTypeDtoList=Lists.newArrayList();
-            medRecordTypeList=BeanUtil.listCopyTo(list,MedRecordType.class);
-            medRecordTypeDtoList=BeanUtil.listCopyTo(list,AMedicalRecordTypeDTO.class);
+            List<MedRecordType> medRecordTypeList;
+            List<AMedicalRecordTypeDTO> medRecordTypeDtoList;
+            medRecordTypeList = BeanUtil.listCopyTo(list, MedRecordType.class);
+            medRecordTypeDtoList = BeanUtil.listCopyTo(list, AMedicalRecordTypeDTO.class);
             execute(medRecordTypeList);
-            return RespDTO.onSuc(medRecordTypeDtoList);
-        }else{
+            return RespDTO.onSuc("操作成功！");
+        } else {
             return RespDTO.onError("未接收到数据!");
         }
     }
 
-    public void execute(List<MedRecordType> medRecordTypeList){
+    public void execute(List<MedRecordType> medRecordTypeList) {
         try {
             List<MedRecordType> addE = Lists.newLinkedList();
             List<MedRecordType> updateE = Lists.newLinkedList();
@@ -74,8 +76,7 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
                 medRecordTypeList.stream().forEach(s -> {
                     MedRecordType mrType = this.getOne(new QueryWrapper<MedRecordType>()
                             .eq("type_id", s.getTypeId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("is_deleted",IsDeleteEnum.N), false);
+                            .eq("hospital_id", s.getHospitalId()), false);
                     if (mrType != null) {
                         s.setGmtModified(new Date());
                         updateE.add(s);
@@ -85,15 +86,15 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
                     }
                 });
             }
-            if(addE.size()>0){
+            if (addE.size() > 0) {
                 medRecordTypeService.saveBatch(addE);
             }
-            if(updateE.size()>0){
+            if (updateE.size() > 0) {
                 medRecordTypeService.updateBatchByKey(updateE);
             }
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("文书类别","", JSON.toJSONString(medRecordTypeList),"",e.getMessage());
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书类别", "", JSON.toJSONString(medRecordTypeList), "", e.getMessage());
         }
 
     }

src/main/java/com/diagbot/service/MedRecordTypeService.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author gaodm
  * @since 2020-04-13
  */
+
 public interface MedRecordTypeService extends IService<MedRecordType> {
 
 }

src/main/java/com/diagbot/vo/data/AMedicalRecordTypeVO.java

@@ -33,4 +33,14 @@ public class AMedicalRecordTypeVO {
      * 拼音
      */
     private String spell;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 删除标志
+     */
+    private String isDeleted;
 }

src/main/resources/application-local.yml

@@ -59,9 +59,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://172.16.203.211:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
-      password: lantone
+      password: langtong
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5
@@ -111,8 +111,8 @@ spring:
     database:
       cache: 8 # cache索引
       token: 8 # Token索引
-    host: 192.168.2.236  #Redis服务器地址
-    port: 6378 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    host: 127.0.0.1  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
       pool:

src/main/resources/mapper/MedRecordTypeMapper.xml

@@ -10,6 +10,7 @@
         <result column="parent_type_id" property="parentTypeId" />
         <result column="obj_name" property="objName" />
         <result column="spell" property="spell" />
+        <result column="content" property="content" />
         <result column="remark" property="remark" />
         <result column="is_deleted" property="isDeleted" />
         <result column="gmt_create" property="gmtCreate" />
@@ -34,6 +35,12 @@
                 <if test="item.spell != null">
                     spell = #{item.spell},
                 </if>
+                <if test="item.content != null">
+                    content = #{item.content},
+                </if>
+                <if test="item.isDeleted != null">
+                    is_deleted = #{item.isDeleted},
+                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/test/java/com/diagbot/CodeGeneration.java

@@ -27,13 +27,13 @@ public class CodeGeneration {
 
         // 全局配置
         GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir("E://code//mrqcsys");
+        gc.setOutputDir("C://Users//94556//Desktop//新建文件夹");
         gc.setFileOverride(true);
         gc.setActiveRecord(false);// 不需要ActiveRecord特性的请改为false
         gc.setEnableCache(false);// XML 二级缓存
         gc.setBaseResultMap(true);// XML ResultMap
         gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("zhoutg");// 作者
+        gc.setAuthor("lipc");// 作者
 
         // 自定义文件命名，注意 %s 会自动填充表实体属性！
         gc.setControllerName("%sController");
@@ -47,16 +47,16 @@ public class CodeGeneration {
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUsername("root");
-        dsc.setPassword("lantone");
-        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
+        dsc.setUsername("teamtec");
+        dsc.setPassword("rpPh9Gn6BQ");
+        dsc.setUrl("jdbc:mysql://192.168.2.121:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
 //        strategy.setTablePrefix(new String[] { "med_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "str_consultation_record"}); // 需要生成的表
+        strategy.setInclude(new String[] { "med_record_type"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);