Commit c15c8d7d34e36852e1c865b2bae5b1b11f573016

Authored by changpengfei
1 parent 4383896798
Exists in master and in 1 other branch dev

病例字段修改

Showing 2 changed files with 6 additions and 44 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java View file @ c15c8d7
... ... @@ -75,6 +75,7 @@
75 75 public BaseResponse savePatient(@Validated LymsPatient patient, BindingResult result, LymsPcase pcase, String illness){
76 76 BaseResponse baseResponse=new BaseResponse();
77 77 log.info(">>>>>>>>>>>>>>>登记病例");
  78 + log.info(">>>>>>>>>>>>>>>登记病例");
78 79 baseResponse.setErrormsg("");
79 80 LymsPatient patient2=lymsPatientService.getOne(Wrappers.query(patient).eq("idno",patient.getIdno()));
80 81 if(patient2==null){
... ... @@ -109,7 +110,7 @@
109 110 for (int i = 0; i < iArr.length; i++) {
110 111 LymsIllness ness=new LymsIllness();
111 112 ness.setCreatedby(patient.getCreatedby());
112   - ness.setPcid(pcase.getId());
  113 + ness.setPcid(pcase.getPcid());
113 114 ness.setIid(Integer.parseInt(iArr[i]));
114 115 ness.setCreatedtime(new Date());
115 116 f=lymsIllnessService.save(ness);
... ... @@ -119,7 +120,7 @@
119 120 //需要添加医院购买卡记录
120 121 LymsTcard tcard=new LymsTcard();
121 122 tcard.setCnt(patient.getCcnt());
122   - tcard.setPcid(pcase.getId());
  123 + tcard.setPcid(pcase.getPcid());
123 124 tcard.setPid(patient.getId());
124 125 tcard.setFid(2);
125 126  
talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPcase.java View file @ c15c8d7
... ... @@ -18,8 +18,8 @@
18 18 /**
19 19 *
20 20 */
21   - @TableId(value = "id", type = IdType.AUTO)
22   - private Integer id;
  21 + @TableId(value = "pcid", type = IdType.AUTO)
  22 + private Integer pcid;
23 23  
24 24 /**
25 25 * 患者id
26 26  
... ... @@ -87,46 +87,7 @@
87 87 @TableField(exist = false)
88 88 private static final long serialVersionUID = 1L;
89 89  
90   - @Override
91   - public boolean equals(Object that) {
92   - if (this == that) {
93   - return true;
94   - }
95   - if (that == null) {
96   - return false;
97   - }
98   - if (getClass() != that.getClass()) {
99   - return false;
100   - }
101   - LymsPcase other = (LymsPcase) that;
102   - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
103   - && (this.getPid() == null ? other.getPid() == null : this.getPid().equals(other.getPid()))
104   - && (this.getMobile() == null ? other.getMobile() == null : this.getMobile().equals(other.getMobile()))
105   - && (this.getHid() == null ? other.getHid() == null : this.getHid().equals(other.getHid()))
106   - && (this.getDid() == null ? other.getDid() == null : this.getDid().equals(other.getDid()))
107   - && (this.getDtid() == null ? other.getDtid() == null : this.getDtid().equals(other.getDtid()))
108   - && (this.getCreatedby() == null ? other.getCreatedby() == null : this.getCreatedby().equals(other.getCreatedby()))
109   - && (this.getCreatedtime() == null ? other.getCreatedtime() == null : this.getCreatedtime().equals(other.getCreatedtime()))
110   - && (this.getUpdatedby() == null ? other.getUpdatedby() == null : this.getUpdatedby().equals(other.getUpdatedby()))
111   - && (this.getUpdatedTime() == null ? other.getUpdatedTime() == null : this.getUpdatedTime().equals(other.getUpdatedTime()));
112   - }
113 90  
114   - @Override
115   - public int hashCode() {
116   - final int prime = 31;
117   - int result = 1;
118   - result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
119   - result = prime * result + ((getPid() == null) ? 0 : getPid().hashCode());
120   - result = prime * result + ((getMobile() == null) ? 0 : getMobile().hashCode());
121   - result = prime * result + ((getHid() == null) ? 0 : getHid().hashCode());
122   - result = prime * result + ((getDid() == null) ? 0 : getDid().hashCode());
123   - result = prime * result + ((getDtid() == null) ? 0 : getDtid().hashCode());
124   - result = prime * result + ((getCreatedby() == null) ? 0 : getCreatedby().hashCode());
125   - result = prime * result + ((getCreatedtime() == null) ? 0 : getCreatedtime().hashCode());
126   - result = prime * result + ((getUpdatedby() == null) ? 0 : getUpdatedby().hashCode());
127   - result = prime * result + ((getUpdatedTime() == null) ? 0 : getUpdatedTime().hashCode());
128   - return result;
129   - }
130 91  
131 92 @Override
132 93 public String toString() {
... ... @@ -134,7 +95,7 @@
134 95 sb.append(getClass().getSimpleName());
135 96 sb.append(" [");
136 97 sb.append("Hash = ").append(hashCode());
137   - sb.append(", id=").append(id);
  98 + sb.append(", pcid=").append(pcid);
138 99 sb.append(", pid=").append(pid);
139 100 sb.append(", mobile=").append(mobile);
140 101 sb.append(", hid=").append(hid);