Ver código fonte

未完成代码

吴少勇 3 anos atrás
pai
commit
6d0b910c93

+ 6 - 0
business/base-service/src/main/java/com/yihu/jw/internet/service/InternetYKYYService.java

@ -0,0 +1,6 @@
package com.yihu.jw.internet.service;
import com.yihu.mysql.query.BaseJpaService;
public class InternetYKYYService{
}

+ 161 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/base/searchClient/BaseSearchNoveltyRepeatDO.java

@ -0,0 +1,161 @@
package com.yihu.jw.entity.base.searchClient;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperatorAES;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "base_search_novelty_repeat")
public class BaseSearchNoveltyRepeatDO extends UuidIdentityEntity {
   private String name;             //委托人姓名
   private String clientPhone;            //联系电话
   private String clientEmail;            //联系邮箱
   private String clientAddress;          //联系地址
   private String applicationSubject;     //申请主题
   private String mechanism;              //机构
   private String clientContent;          //申请内容
   private String fileUrl;                //文件url
   private String createTime;             //创建时间
   private String createUser;             //创建人
   private String createUserName;         //创建人姓名
   private String updateTime;             //更新时间
   private String updateUser;             //更新人
   private String updateUserName;         //更新人名称
   private String status;                 //状态(1待接收、2办理中、3已退回、4已办结)
   private String clientNumber;           //委托单号
   @Column(name = "name")
   public String getName() {
      return name;
   }
   public void setName(String name) {
      this.name = name;
   }
   @Column(name = "phone")
   public String getClientPhone() {
      return clientPhone;
   }
   public void setClientPhone(String clientPhone) {
      this.clientPhone = clientPhone;
   }
   @Column(name = "email")
   public String getClientEmail() {
      return clientEmail;
   }
   public void setClientEmail(String clientEmail) {
      this.clientEmail = clientEmail;
   }
   @Column(name = "address")
   public String getClientAddress() {
      return clientAddress;
   }
   public void setClientAddress(String clientAddress) {
      this.clientAddress = clientAddress;
   }
   @Column(name = "subject")
   public String getApplicationSubject() {
      return applicationSubject;
   }
   public void setApplicationSubject(String applicationSubject) {
      this.applicationSubject = applicationSubject;
   }
   @Column(name = "mechanism")
   public String getMechanism() {
      return mechanism;
   }
   public void setMechanism(String mechanism) {
      this.mechanism = mechanism;
   }
   @Column(name = "content")
   public String getClientContent() {
      return clientContent;
   }
   public void setClientContent(String clientContent) {
      this.clientContent = clientContent;
   }
   @Column(name = "file")
   public String getFileUrl() {
      return fileUrl;
   }
   public void setFileUrl(String fileUrl) {
      this.fileUrl = fileUrl;
   }
   @Column(name = "create_time")
   public String getCreateTime() {
      return createTime;
   }
   public void setCreateTime(String createTime) {
      this.createTime = createTime;
   }
   @Column(name = "create_user")
   public String getCreateUser() {
      return createUser;
   }
   public void setCreateUser(String createUser) {
      this.createUser = createUser;
   }
   @Column(name = "create_user_name")
   public String getCreateUserName() {
      return createUserName;
   }
   public void setCreateUserName(String createUserName) {
      this.createUserName = createUserName;
   }
   @Column(name = "update_time")
   public String getUpdateTime() {
      return updateTime;
   }
   public void setUpdateTime(String updateTime) {
      this.updateTime = updateTime;
   }
   @Column(name = "update_user")
   public String getUpdateUser() {
      return updateUser;
   }
   public void setUpdateUser(String updateUser) {
      this.updateUser = updateUser;
   }
   @Column(name = "update_user_name")
   public String getUpdateUserName() {
      return updateUserName;
   }
   public void setUpdateUserName(String updateUserName) {
      this.updateUserName = updateUserName;
   }
   @Column(name = "status")
   public String getStatus() {
      return status;
   }
   public void setStatus(String status) {
      this.status = status;
   }
   @Column(name = "number")
   public String getClientNumber() {
      return clientNumber;
   }
   public void setClientNumber(String clientNumber) {
      this.clientNumber = clientNumber;
   }
}

+ 7 - 0
common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@ -857,4 +857,11 @@ public class BaseRequestMapping {
        public static final String findDrugstoreById  = "/findDrugstoreById";
    }
    public static class BaseSearchNoveltyRepeat extends Basic {
        public static final String PREFIX = "/open/noLogin/baseSearch";
        public static final String saveBaseSearchNoveltyRepeat = "/saveBaseSearchNoveltyRepeat";
    }
}

+ 4 - 1
common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@ -1537,7 +1537,10 @@ public class BaseHospitalRequestMapping {
        //查询医师唯一标识
        public static final String FINDACHNSBYCREATETIME = "/findAchnsByCreateTime";
        //待插入
        //获取医师唯一标识分类列表
        public static final String FINDACHNSLIST = "/findAchnsList";
        //
        //保存网络咨询服务信息
        public static final String SAVENSOLINEASK = "/saveNsOlineAsk";

+ 9 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/dao/searchClient/BaseSearchNoveltyRepeatDao.java

@ -0,0 +1,9 @@
package com.yihu.jw.base.dao.searchClient;
import com.yihu.jw.entity.base.searchClient.BaseSearchNoveltyRepeatDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseSearchNoveltyRepeatDao extends PagingAndSortingRepository<BaseSearchNoveltyRepeatDO,String>, JpaSpecificationExecutor<BaseSearchNoveltyRepeatDO> {
}

+ 46 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/searchClient/ClientSearchEndpoint.java

@ -0,0 +1,46 @@
package com.yihu.jw.base.endpoint.searchClient;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.searchClient.BaseSearchNoveltyRepeatService;
import com.yihu.jw.entity.base.searchClient.BaseSearchNoveltyRepeatDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@Api(value = "查新查重服务",description = "查新查重服务",tags = {"查新查重服务"})
@RequestMapping(value = BaseRequestMapping.BaseSearchNoveltyRepeat.PREFIX)
public class ClientSearchEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private BaseSearchNoveltyRepeatService baseSearchNoveltyRepeatService;
    @ApiOperation(value = "保存申请信息")
    @PostMapping(value = BaseRequestMapping.BaseSearchNoveltyRepeat.saveBaseSearchNoveltyRepeat)
    public Envelop saveBaseSearchNoveltyRepeat(@ApiParam(name = "jsonData", value = "")
                                               @RequestParam(name = "jsonData", required = true) String jsonData) throws Exception{
        try{
            BaseSearchNoveltyRepeatDO data = objectMapper.readValue(jsonData, new TypeReference<BaseSearchNoveltyRepeatDO>(){});
            baseSearchNoveltyRepeatService.saveBaseSearchNoveltyRepeat(data);
            return success("success");
        }catch (Exception e){
            return failedObjEnvelopException(e);
        }
    }
}

+ 44 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/service/searchClient/BaseSearchNoveltyRepeatService.java

@ -0,0 +1,44 @@
package com.yihu.jw.base.service.searchClient;
import com.yihu.jw.base.dao.searchClient.BaseSearchNoveltyRepeatDao;
import com.yihu.jw.entity.base.searchClient.BaseSearchNoveltyRepeatDO;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Service;
import javax.xml.crypto.Data;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.logging.SimpleFormatter;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@Service
public class BaseSearchNoveltyRepeatService extends BaseJpaService<BaseSearchNoveltyRepeatDO, BaseSearchNoveltyRepeatDao> {
    @Autowired
    private BaseSearchNoveltyRepeatDao baseSearchNoveltyRepeatDao;
    public void saveBaseSearchNoveltyRepeat(BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO) throws Exception{
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
            if (StringUtils.isNoneBlank(baseSearchNoveltyRepeatDO.getId())){
                BaseSearchNoveltyRepeatDO old = baseSearchNoveltyRepeatDao.findOne(baseSearchNoveltyRepeatDO.getId());
                BeanUtils.copyProperties(baseSearchNoveltyRepeatDO, old, getNullPropertyNames(baseSearchNoveltyRepeatDO));
                old.setUpdateTime(sdf.format(new Date()));
                baseSearchNoveltyRepeatDao.save(old);
            }else{
                baseSearchNoveltyRepeatDO.setCreateTime(sdf.format(new Date()));
                baseSearchNoveltyRepeatDao.save(baseSearchNoveltyRepeatDO);
            }
    }
}

+ 1 - 1
svr/svr-base/src/main/resources/bootstrap.yml

@ -1,6 +1,6 @@
spring:
  application:
    name: svr-base
    name: svr-base-mac
  cloud:
    config:
      failFast: true

+ 14 - 14
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/thirdUpload/ThirdUploadEndpoint.java

@ -19,13 +19,13 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.yihu.jw.rm.regulatory.BaseRegulatoryRequestMapping;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.PREFIX)     //请求地址前缀  /regulatory
@RequestMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.PREFIX)     //请求地址前缀  /open/gc/regulatory
@Api(value = "监管平台数据增删改查", description = "监管平台数据增删改查", tags = {"监管平台数据增删改查"})
public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
    @Autowired
@ -51,7 +51,7 @@ public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private BaseNsPrescriptionDrugService baseNsPrescriptionDrugService;
    @PostMapping(value = BaseRegulatoryRequestMapping.UpWebTherapySupserviceInfo.SAVEACHNS)     //请求地址  /saveAchns
    @PostMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.SAVEACHNS)     //请求地址  /saveAchns
    @ApiOperation(value = "保存医师唯一标识")
    public Envelop saveAchns(@ApiParam(name = "jsonData", value = "")
                             @RequestParam(name = "jsonData", required = true) String jsonData) throws Exception {
@ -65,7 +65,7 @@ public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
            return failedObjEnvelopException(e);
        }
    }
    @GetMapping(value = BaseRegulatoryRequestMapping.UpWebTherapySupserviceInfo.DELETEACHNS)    //请求地址  /deleteAchns
    @GetMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.DELETEACHNS)    //请求地址  /deleteAchns
    @ApiOperation(value = "删除医师唯一标识")
    public Envelop deleteAchns(@ApiParam(name = "id", value = "")
                               @RequestParam(name = "id", required = true) String id) throws Exception {
@ -78,7 +78,7 @@ public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = BaseRegulatoryRequestMapping.UpWebTherapySupserviceInfo.FINDACHNSBYCREATETIME)
    @GetMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.FINDACHNSBYCREATETIME)
    @ApiOperation(value = "查询医师唯一标识")
    public Envelop findAchnsByCreateTime(@ApiParam(name = "date", value = "yyyy-mm-dd")
                                         @RequestParam(name = "date", required = true) String date) throws Exception {
@ -419,7 +419,7 @@ public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
        }
    }
    @PostMapping(value = BaseRegulatoryRequestMapping.UpWebTherapySupserviceInfo.SAVENSOLINEASK)
    @PostMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.SAVENSOLINEASK)
    @ApiOperation(value = "保存网络咨询服务信息")
    public Envelop saveNsOlineAsk(@ApiParam(name = "jsonData", value = "")
                                  @RequestParam(name = "jsonData",required = true) String jsonData) throws Exception{
@ -433,7 +433,7 @@ public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = BaseRegulatoryRequestMapping.UpWebTherapySupserviceInfo.DELETESOLINEASK)
    @GetMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.DELETESOLINEASK)
    @ApiOperation(value = "删除网络咨询信息")
    public Envelop deleteNsOlineAsk(@ApiParam(name = "id", value = "")
                                    @RequestParam(name = "id", required = true) String id) throws Exception{
@ -445,7 +445,7 @@ public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
        }
    }
    @PostMapping(value = BaseRegulatoryRequestMapping.UpWebTherapySupserviceInfo.SAVENSONLINEMED)
    @PostMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.SAVENSONLINEMED)
    @ApiOperation(value = "保存网络诊疗信息")
    public Envelop saveNsOnlinemed(@ApiParam(name = "jsonData", value = "")
                                   @RequestParam(name = "jsonData",required = true) String jsonData) throws Exception{
@ -458,7 +458,7 @@ public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = BaseRegulatoryRequestMapping.UpWebTherapySupserviceInfo.DELETENSONLINEMED)
    @GetMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.DELETENSONLINEMED)
    @ApiOperation(value = "删除网络咨询信息")
    public Envelop deleteNsonlinemed(@ApiParam(name = "id", value = "")
                                    @RequestParam(name = "id", required = true) String id) throws Exception{
@ -470,7 +470,7 @@ public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
        }
    }
    @PostMapping(value = BaseRegulatoryRequestMapping.UpWebTherapySupserviceInfo.SAVEPRESCRIPTION)
    @PostMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.SAVEPRESCRIPTION)
    @ApiOperation(value = "保存电子处方")
    public Envelop savePrescription(@ApiParam(name = "jsonData", value = "")
                                    @RequestParam(name = "jsonData",required = true) String jsonData)throws Exception{
@ -483,7 +483,7 @@ public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = BaseRegulatoryRequestMapping.UpWebTherapySupserviceInfo.DELETEPRESCRIPTION)
    @GetMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.DELETEPRESCRIPTION)
    @ApiOperation(value = "删除电子处方")
    public Envelop deletePrescription(@ApiParam(name = "id", value = "")
                                     @RequestParam(name = "id", required = true) String id) throws Exception{
@ -495,7 +495,7 @@ public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
        }
    }
    @PostMapping(value = BaseRegulatoryRequestMapping.UpWebTherapySupserviceInfo.SAVEPRESCRIPTIONDRUG)
    @PostMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.SAVEPRESCRIPTIONDRUG)
    @ApiOperation(value = "保存电子处方药品明细")
    public Envelop savePrescriptionDrug(@ApiParam(name = "jsonData", value = "")
                                        @RequestParam(name = "jsonData",required = true) String jsonData) throws Exception{
@ -508,7 +508,7 @@ public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = BaseRegulatoryRequestMapping.UpWebTherapySupserviceInfo.DELETEPRESCRIPTIONDRUG)
    @GetMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.DELETEPRESCRIPTIONDRUG)
    @ApiOperation(value = "删除电子处方")
    public Envelop deletePrescriptionDrug(@ApiParam(name = "id", value = "")
                                      @RequestParam(name = "id", required = true) String id) throws Exception{
@ -520,5 +520,5 @@ public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
        }
    }
}

+ 1 - 2
svr/svr-internet-hospital/src/main/resources/bootstrap.yml

@ -1,6 +1,6 @@
spring:
  application:
    name:  svr-internet-hospital
    name:  svr-internet-hospital-wushaoyong-mac
  cloud:
    config:
      failFast: true
@ -24,7 +24,6 @@ spring:
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: qytest
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://127.0.0.1:1221}