Merge remote-tracking branch 'origin/dev/diagbotcloud20190918_vital' into dev/diagbotcloud20190918_vital

aipt-service/src/main/java/com/diagbot/web/IndexDataController.java

@@ -34,7 +34,9 @@ public class IndexDataController {
     @Autowired
     IndexDataFacade indexDataFacade;
 
-    @ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]", notes = "diseaseName：疾病名  必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
+    @ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]",
+                  notes = "diseaseName：疾病名  必填<br> patientId:患者id ,必填<br> " +
+                          "startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
     @PostMapping("/getIndexDatas")
     @SysLogger("getIndexDatas")
     public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
@@ -42,7 +44,11 @@ public class IndexDataController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
+    @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]",
+                  notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> " +
+                          "IndexData：{指标公表名 :indexUnique;" +
+                          "指标值indexValue;指标单位 indexUnit;是否异常 " +
+                          "isAbnormal;化验时间creatTime;}")
     @PostMapping("/saveIndexDatas")
     @SysLogger("saveIndexDatas")
     @Transactional

icss-service/src/main/java/com/diagbot/web/DoctorPageModeController.java

@@ -42,7 +42,8 @@ public class DoctorPageModeController {
     @Autowired
     DoctorPageModeFacade doctorPageModeFacade;
 
-    @ApiOperation(value = "保存医生页面结构设置信息[by:wangfeng]", notes = "医生id : doctorId;</br>模式分类: modeClassify;</br> 模式值: modeValue;")
+    @ApiOperation(value = "保存医生页面结构设置信息[by:wangfeng]",
+            notes = "医生id : doctorId;</br>模式分类: modeClassify;</br> 模式值: modeValue;")
     @PostMapping("/saveDoctorPageModes")
     @SysLogger("saveDoctorPageModes")
     @Transactional

icss-service/src/main/java/com/diagbot/web/IndexDataController.java

@@ -35,14 +35,19 @@ public class IndexDataController {
     @Autowired
     IndexDataFacade indexDataFacade;
 
-    @ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]", notes = "diseaseName：疾病名 必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
+    @ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]",
+                  notes = "diseaseName：疾病名 必填<br> patientId:患者id ,必填<br> " +
+                          "startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
     @PostMapping("/getIndexDatas")
     @SysLogger("getIndexDatas")
     public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
         return RespDTO.onSuc(indexDataFacade.getIndexDataAll(indexDataFindVO));
     }
 
-    @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> doctorId：医生id必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
+    @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]",
+                  notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> doctorId：" +
+                          "医生id必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;" +
+                          "指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
     @PostMapping("/saveIndexDatas")
     @SysLogger("saveIndexDatas")
     @Transactional

icss-service/src/main/java/com/diagbot/web/LisExcelResController.java

@@ -30,7 +30,8 @@ public class LisExcelResController {
 
     @ApiOperation(value = "导入化验数据:[by:wangfeng]", notes = "导入化验数据")
     @PostMapping(value = "/lisExcelAnalysis", produces="text/html;charset=utf-8")
-    public String lisExcelAnalysis(@RequestParam("uploadfile") MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO, HttpServletRequest request) {
+    public String lisExcelAnalysis(@RequestParam("uploadfile") MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO,
+                                   HttpServletRequest request) {
         return GsonUtil.toJson(lisExcelResFacade.lisExcelAnalysis(file,lisHospitalCodeVO, request));
     }
 }

icss-service/src/main/java/com/diagbot/web/PrintRecordController.java

@@ -29,9 +29,12 @@ public class PrintRecordController {
     @Autowired
     PrintRecordFacade printRecordFacade;
 
-    @ApiOperation(value = "保存打印记录[by:wangfeng]", notes = "疾病名称 :name</br>医生id:doctorId</br>医院编码 : hospitalId</br>"
-            + "患者id:patientId</br>"
-            + "医院部门id:hospitalDeptId</br> 问诊号:inquiryCode</br>文本内容 :content </br>{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>dataJson:内容JSON字符串(打印页面展示)")
+    @ApiOperation(value = "保存打印记录[by:wangfeng]",
+                  notes = "疾病名称 :name</br>医生id:doctorId</br>医院编码 : hospitalId</br>" +
+                          "患者id:patientId</br>" +
+                          "医院部门id:hospitalDeptId</br> 问诊号:inquiryCode</br>文本内容 :content </br>" +
+                          "{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>" +
+                          "dataJson:内容JSON字符串(打印页面展示)")
     @PostMapping("/savePrintRecords")
     @SysLogger("savePrintRecords")
     @Transactional

icss-service/src/main/java/com/diagbot/web/TemplateInfoController.java

@@ -63,9 +63,11 @@ public class TemplateInfoController {
     }
 
 
-    @ApiOperation(value = "保存病历模板[by:wangfeng]", notes = "modeName;//模板名字</br>"
-            + "doctorId;//医生id</br>hospitalId;//医院id</br>hospitalDeptId;//部门id</br>"
-            + "modeType;//模板类型</br>preview;//预览文本</br>{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>dataJson;//模板数据</br>")
+    @ApiOperation(value = "保存病历模板[by:wangfeng]", notes = "modeName;//模板名字</br>"+
+             "doctorId;//医生id</br>hospitalId;//医院id</br>hospitalDeptId;//部门id</br>"+
+             "modeType;//模板类型</br>preview;//预览文本</br>" +
+             "{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>" +
+             "dataJson;//模板数据</br>")
     @PostMapping("/saveTemplateInfo")
     @SysLogger("saveTemplateInfo")
     @Transactional

tran-service/src/main/java/com/diagbot/facade/SysSetFacade.java

@@ -24,9 +24,7 @@ public class SysSetFacade extends SysSetServiceImpl {
      * @return
      */
     public List<SysSetInfoDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
-        //		 QueryWrapper<SysSet> queryWrapper = new QueryWrapper<SysSet>();
-        //	        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-        //	        			.in("hospital_code", hospitalSetVO.getHospitalCode());
+        
         if (IntegerUtil.isNull(hospitalSetVO.getPlan())) {
             hospitalSetVO.setPlan(0);
         }

tran-service/src/main/java/com/diagbot/facade/TranLisConfigFacade.java

@@ -76,7 +76,9 @@ public class TranLisConfigFacade extends TranLisConfigServiceImpl{
 	public Map<String, List<String>> getLisConfigByUniqueNameAndHosCode(LisConfigVO lisConfigVO) {
 		Map<String, List<String>> retMap = new LinkedHashMap<>();
 		QueryWrapper<TranLisConfig> tranLisConfigQueryWrapper = new QueryWrapper<>();
-		tranLisConfigQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("hospital_code",lisConfigVO.getHosCode());
+		tranLisConfigQueryWrapper
+				.eq("is_deleted", IsDeleteEnum.N.getKey())
+				.eq("hospital_code",lisConfigVO.getHosCode());
 		if(ListUtil.isNotEmpty(lisConfigVO.getUniqueNameList())){
 			tranLisConfigQueryWrapper.in("unique_name",lisConfigVO.getUniqueNameList());
 		}

tran-service/src/main/java/com/diagbot/web/IndexDataController.java

@@ -1,25 +1,22 @@
 package com.diagbot.web;
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.IndexDataFacade;
 import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -35,28 +32,33 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 public class IndexDataController {
 
-	@Autowired
-	IndexDataFacade indexDataFacade;
+    @Autowired
+    IndexDataFacade indexDataFacade;
 
-	@ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]", notes = "diseaseName：疾病名  必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ids：查询的指标id")
-	@PostMapping("/getIndexDatas")
-	@SysLogger("getIndexDatas")
-	public RespDTO<List<IndexDataDTO>> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
+    @ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]",
+                  notes = "diseaseName：疾病名  必填<br> patientId:患者id ,必填<br> " +
+                          "startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ids：查询的指标id")
+    @PostMapping("/getIndexDatas")
+    @SysLogger("getIndexDatas")
+    public RespDTO<List<IndexDataDTO>> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
 
-		 List<IndexDataDTO> data = indexDataFacade.quisitionIndexDataAll(indexDataFindVO);
+        List<IndexDataDTO> data = indexDataFacade.quisitionIndexDataAll(indexDataFindVO);
 
-		return RespDTO.onSuc(data);
-	}
+        return RespDTO.onSuc(data);
+    }
 
-	@ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
-	@PostMapping("/saveIndexDatas")
-	@SysLogger("saveIndexDatas")
-	@Transactional
-	public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
+    @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]",
+                  notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> " +
+                          "IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 " +
+                          "indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
+    @PostMapping("/saveIndexDatas")
+    @SysLogger("saveIndexDatas")
+    @Transactional
+    public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
 
-		boolean res = indexDataFacade.saveIndexDatas(indexDataSaveVO);
+        boolean res = indexDataFacade.saveIndexDatas(indexDataSaveVO);
 
-		return RespDTO.onSuc(res);
-	}
+        return RespDTO.onSuc(res);
+    }
 }